Changeset 1154 for cpp/common

Timestamp:

10/01/21 22:39:55 (3 years ago)

Author:

Maciej Komosinski

Message:

Supported another variant of qsort()

File:

• cpp/common/nonstd.h (modified) (1 diff)

cpp/common/nonstd.h

@@ -57 +57 @@
 //How cool, gcc&clang: qsort_r(a,b), borland: qsort_s(a,b), visual: qsort_s(b,a)
 #ifdef __BORLANDC__
- #define qsort_r qsort_s
+#define CALL_QSORT_R(base,nmemb,size,compar,context) qsort_s(base,nmemb,size,compar,context)
 #endif
 
 #ifdef _MSC_VER
- #define QSORT_R_USING_QSORT_S //qsort_r callers use this macro to adjust argument order in comparator, because microsoft and gcc&clang are incompatible here
- #define qsort_r(base,nmemb,size,compar,context) qsort_s((base),(nmemb),(size),(compar),(context))
+ #define QSORT_R_THIS_FIRST //qsort_r callers use this macro to adjust argument order in comparator, because microsoft and gcc&clang are incompatible here
+ #define CALL_QSORT_R(base,nmemb,size,compar,context) qsort_s((base),(nmemb),(size),(compar),(context))
+#endif
+
+#if defined MACOS || defined IPHONE
+//qsort_r(void *__base, size_t __nel, size_t __width, void *, int (* _Nonnull __compar)(void *, const void *, const void *));
+#define QSORT_R_THIS_FIRST
+#define CALL_QSORT_R(base,nmemb,size,compar,context) qsort_r(base,nmemb,size,context,compar)
+#endif
+
+#ifndef CALL_QSORT_R
+#define CALL_QSORT_R(base,nmemb,size,compar,context) qsort_r(base,nmemb,size,compar,context)
 #endif