Changeset 936 for cpp/common

Timestamp:

05/30/20 20:25:42 (5 years ago)

Author:

Maciej Komosinski

Message:

Supported qsort_r()/qsort_s() in Borland/Embarcadero? compiler

File:

• cpp/common/nonstd.h (modified) (2 diffs)

cpp/common/nonstd.h

@@ -46 +46 @@
 #endif
 
-#if defined MACOS || defined __ANDROID__ || defined IPHONE
+#if defined(MACOS) || defined(__ANDROID__) || defined(IPHONE)
  #define stricmp(a,b) strcasecmp(a,b)
  #define strnicmp(a,b,c) strncasecmp(a,b,c)
@@ -55 +55 @@
 //typedef char byte; //rozne srodowiska c++ definiuja byte jako unsigned char! w javie jest inaczej -> trzeba i tak zmienic w portowanych zrodlach byte na char.
 
+//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
+#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_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))
 #endif