Changeset fc34c4 in git

Timestamp:

Nov 21, 2013, 8:35:14 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

40971d53362e3fb612b5ee52d46dc9023f52e8cd

Parents:

a2f79c054ca40c801a773fd34d33c63c5b21f130e8cd086d3ec855c9abedde655e4bea26079de829

Message:

Merge pull request #428 from jankoboehm/spielwiese

Fix for Cygwin: cast to pointer from integer of different size

File:

• libpolys/coeffs/modulop.h (modified) (3 diffs)

libpolys/coeffs/modulop.h

@@ -125 +125 @@
                        r->ch-(long)b+(long)a : (long)a-(long)b);
 }
+
+static inline number npNegM(number a, const coeffs r)
+{
+  return (number)((long)(r->ch)-(long)(a));
+}
+
 #else
 static inline number npAddM(number a, number b, const coeffs r)
@@ -147 +153 @@
    return (number)res;
 }
+
+
+static inline number npNegM(number b, const coeffs r)
+{
+   long res =  - (long)b;
+#if SIZEOF_LONG == 8
+   res += (res >> 63) & r->ch;
+#else
+   res += (res >> 31) & r->ch;
+#endif
+   return (number)res;
+}
+
 #endif
 
@@ -160 +179 @@
 
 
-#define npNegM(A,r)      (number)((long)r->ch-(long)(A))
+
+
+
 #define npEqualM(A,B,r)  ((A)==(B))