Changeset 2407cb in git

Timestamp:

May 31, 2013, 6:44:31 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

33161fd92744b4c3b711de9f059b40511622d1c9

Parents:

8b368ff67a7ef888aa2e3b02b2f425f07dc87cc1

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-05-31 18:44:31+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-07 04:41:44+02:00

Message:

Fix qsort usage due to MAC OS X

fix: non-standard qsort_r (_GNU_SOURCE) usage

File:

• dyn_modules/syzextra/mod_main.cc (modified) (6 diffs)

dyn_modules/syzextra/mod_main.cc

@@ -49 +49 @@
 #include <stdlib.h>
 #include <string.h>
+
+
+#ifdef _GNU_SOURCE
+#define qsort_my(m, s, ss, r, cmp) qsort_r(m, s, ss, cmp, r)
+#else
+#define qsort_my(m, s, ss, r, cmp) qsort_r(m, s, ss, cmp)
+#endif
+
 
 
@@ -522 +530 @@
 
 
+#ifdef _GNU_SOURCE
 static int cmp_c_ds(const void *p1, const void *p2, void *R)
 {
+#else
+static int cmp_c_ds(const void *p1, const void *p2)
+{
+  void *R = currRing; 
+#endif
+
   const int YES = 1;
   const int NO = -1;
 
   const ring r =  (const ring) R; // TODO/NOTE: the structure is known: C, lp!!!
+
+  assume( r == currRing );
 
   const poly a = *(const poly*)p1;
@@ -543 +560 @@
   // TODO: test this!!!!!!!!!!!!!!!!
 
-  //return -( compare (c, ds) )
+  //return -( compare (c, qsorts) )
 
   const int __DEBUG__ = 0;
@@ -753 +770 @@
 
     if( sizeNew >= 2 )
-      qsort_r(newid->m, sizeNew, sizeof(poly), cmp_c_ds, r);
+      qsort_my(newid->m, sizeNew, sizeof(poly), r, cmp_c_ds);
 
     if (IDELEMS(newid) == 0 || (IDELEMS(newid) == 1 && newid->m[0] == NULL) )
@@ -828 +845 @@
 
     if( size >= 2 )
-      qsort_r(newid->m, size, sizeof(poly), cmp_c_ds, r);
+      qsort_my(newid->m, size, sizeof(poly), r, cmp_c_ds);
     
 //    res->data = newid;
@@ -1035 +1052 @@
 
     if( sizeNew >= 2 )
-      qsort_r(newid->m, sizeNew, sizeof(poly), cmp_c_ds, r);
+      qsort_my(newid->m, sizeNew, sizeof(poly), r, cmp_c_ds);
 
     if (IDELEMS(newid) == 0 || (IDELEMS(newid) == 1 && newid->m[0] == NULL) )