Changeset bebd13f in git for factory/ffops.h

Timestamp:

Nov 8, 2013, 10:18:53 AM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

35c26414eab02dda7305d2a199bc7a351daf705d

Parents:

13f7b2794703c329b4c6179ef9db9eb16b305824fd6816507d9d8040e8379a880a5d36da704d9da1

Message:

Merge pull request #417 from jankoboehm/spielwiese

Fixed name conflict INT64 and wrong type (windows port)

File:

• factory/ffops.h (modified) (3 diffs)

factory/ffops.h

@@ -12 +12 @@
 
 /* define type of your compilers 64 bit integer type */
-#ifndef INT64
-#define INT64 long long int
+#ifndef FACTORY_INT64
+#define FACTORY_INT64 long long int
 #endif
 
@@ -77 +77 @@
 }
 
-inline int ff_bignorm ( const INT64 a )
+inline int ff_bignorm ( const FACTORY_INT64 a )
 {
-    int n = (int)(a % (INT64)ff_prime);
+    int n = (int)(a % (FACTORY_INT64)ff_prime);
 #if defined(i386) || defined(NTL_AVOID_BRANCHING)
     n += (n >> 31) & ff_prime;
@@ -134 +134 @@
 {
     if ( ff_big )
-        return ff_bignorm( (INT64)a * (INT64)b );
+        return ff_bignorm( (FACTORY_INT64)a * (FACTORY_INT64)b );
     else
         return ff_longnorm ( (long)a * (long)b );