Changeset 3b81cff in git

Timestamp:

May 21, 2014, 3:29:45 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

53c637d80a5ba58b677f83154bbf0cb53d858d9e

Parents:

064cfcc1f2a60deb26674aaf2d6b4631c815ac4f

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-21 15:29:45+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-26 18:59:32+02:00

Message:

Fix the usage of qsort_r under Mac OS X

File:

• Singular/dyn_modules/syzextra/syzextra.cc (modified) (5 diffs)

Singular/dyn_modules/syzextra/syzextra.cc

@@ -66 +66 @@
 BEGIN_NAMESPACE(SORT_c_ds)
 
-
-#ifdef _GNU_SOURCE
-static int cmp_c_ds(const void *p1, const void *p2, void *R)
-{
+#if (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || defined __FREEBSD__ || defined __BSD__ || defined OpenBSD3_1 || defined OpenBSD3_9)
+static int cmp_c_ds(void *R, const void *p1, const void *p2){
+#elif (defined _GNU_SOURCE || defined __GNU__ || defined __linux__)
+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
-
+static int cmp_c_ds(const void *p1, const void *p2){ void *R = currRing;
+#endif
+  assume(R != NULL);
   const int YES = 1;
   const int NO = -1;
@@ -81 +79 @@
   const ring r =  (const ring) R; // TODO/NOTE: the structure is known: C, lp!!!
 
-  assume( r == currRing );
+  assume( r == currRing ); // for now...
 
   const poly a = *(const poly*)p1;
@@ -154 +152 @@
 }
 
-
+/*
 static int cmp_poly(const poly &a, const poly &b)
 {
@@ -200 +198 @@
   return 0;
 }
+*/
 
 END_NAMESPACE
@@ -390 +389 @@
   const int sizeNew = IDELEMS(id);
 
-#ifdef _GNU_SOURCE
+#if (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || defined __FREEBSD__ || defined __BSD__ || defined OpenBSD3_1 || defined OpenBSD3_9)
+#define qsort_my(m, s, ss, r, cmp) qsort_r(m, s, ss, r, cmp)
+#elif (defined _GNU_SOURCE || defined __GNU__ || defined __linux__)
 #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)
+#define qsort_my(m, s, ss, r, cmp) qsort(m, s, ss, cmp)
 #endif