Changeset 50a6c5 in git

Timestamp:

Jun 17, 2014, 5:09:14 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

cbb7532c858edb13f6b986e888868ff61d03394eedc416b44656d35f356464a6169a30f16686a2d7

Parents:

f8df35286530f57c88ffeb98595d16aa5edd60f4

Message:

fix: qsort_r

qsort_r is non-standard, esp. BSD and (newer) LINUX define it differently.
At least one has to test for it (testing OS is not enough).

Files:

• Singular/dyn_modules/syzextra/syzextra.cc (modified) (2 diffs)
• configure.ac (modified) (1 diff)

Singular/dyn_modules/syzextra/syzextra.cc

@@ -388 +388 @@
 {
   const int sizeNew = IDELEMS(id);
-
+  typedef int(*cmp_fct)(const void *, const void *);
+
+#ifdef HAVE_QSORT_R
 #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)
@@ -394 +396 @@
 #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(m, s, ss, cmp)
+#define qsort_my(m, s, ss, r, cmp) qsort(m, s, ss, (cmp_fct)(cmp))
+#endif
+#else
+#define qsort_my(m, s, ss, r, cmp) qsort(m, s, ss, (cmp_fct)(cmp))
 #endif
 

configure.ac

@@ -42 +42 @@
 AC_CHECK_HEADERS(unistd.h iostream.h sys/time.h sys/times.h asm/sigcontext.h)
 
-AC_CHECK_FUNCS(readlink getcwd getwd setenv putenv)
+AC_CHECK_FUNCS(readlink getcwd getwd setenv putenv qsort_r)