Changeset 3b81cff in git


Ignore:
Timestamp:
May 21, 2014, 3:29:45 PM (10 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
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:
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/dyn_modules/syzextra/syzextra.cc

    r064cfc r3b81cff  
    6666BEGIN_NAMESPACE(SORT_c_ds)
    6767
    68 
    69 #ifdef _GNU_SOURCE
    70 static int cmp_c_ds(const void *p1, const void *p2, void *R)
    71 {
     68#if (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || defined __FREEBSD__ || defined __BSD__ || defined OpenBSD3_1 || defined OpenBSD3_9)
     69static int cmp_c_ds(void *R, const void *p1, const void *p2){
     70#elif (defined _GNU_SOURCE || defined __GNU__ || defined __linux__)
     71static int cmp_c_ds(const void *p1, const void *p2, void *R){
    7272#else
    73 static int cmp_c_ds(const void *p1, const void *p2)
    74 {
    75   void *R = currRing;
    76 #endif
    77 
     73static int cmp_c_ds(const void *p1, const void *p2){ void *R = currRing;
     74#endif
     75  assume(R != NULL);
    7876  const int YES = 1;
    7977  const int NO = -1;
     
    8179  const ring r =  (const ring) R; // TODO/NOTE: the structure is known: C, lp!!!
    8280
    83   assume( r == currRing );
     81  assume( r == currRing ); // for now...
    8482
    8583  const poly a = *(const poly*)p1;
     
    154152}
    155153
    156 
     154/*
    157155static int cmp_poly(const poly &a, const poly &b)
    158156{
     
    200198  return 0;
    201199}
     200*/
    202201
    203202END_NAMESPACE
     
    390389  const int sizeNew = IDELEMS(id);
    391390
    392 #ifdef _GNU_SOURCE
     391#if (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || defined __FREEBSD__ || defined __BSD__ || defined OpenBSD3_1 || defined OpenBSD3_9)
     392#define qsort_my(m, s, ss, r, cmp) qsort_r(m, s, ss, r, cmp)
     393#elif (defined _GNU_SOURCE || defined __GNU__ || defined __linux__)
    393394#define qsort_my(m, s, ss, r, cmp) qsort_r(m, s, ss, cmp, r)
    394395#else
    395 #define qsort_my(m, s, ss, r, cmp) qsort_r(m, s, ss, cmp)
     396#define qsort_my(m, s, ss, r, cmp) qsort(m, s, ss, cmp)
    396397#endif
    397398
Note: See TracChangeset for help on using the changeset viewer.