Changeset fd68165 in git for factory/ffops.h

Timestamp:

Nov 7, 2013, 6:42:08 PM (10 years ago)

Author:

Janko Boehm <boehm@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

bebd13f12467d52870735cd4cfae940241fef019

Parents:

4a4593a9cc860e3c2819808ef08faab1b9a48009

git-author:

Janko Boehm <boehm@mathematik.uni-kl.de>2013-11-07 18:42:08+01:00

git-committer:

Janko Boehm <boehm@mathematik.uni-kl.de>2013-11-07 18:46:02+01:00

Message:

Fixed name conflict INT64 and wrong type

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 );