Changeset 931

Timestamp:

05/28/20 17:56:12 (4 years ago)

Author:

Maciej Komosinski

Message:

Supported all platforms using either qsort_r() or qsort_s()

Location:

cpp

Files:

• common/nonstd.h (modified) (2 diffs)
• frams/vm/classes/collectionobj.cpp (modified) (1 diff)

cpp/common/nonstd.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2019  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -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.
 
-
+#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))
+#endif
 
 #ifdef __BORLANDC__

cpp/frams/vm/classes/collectionobj.cpp

@@ -270 +270 @@
         VMachine *vm;
         VMVEComparator(VMachine::JumpTargetObject *_jto) :jto(_jto), vm(jto->vm) {}
+#ifdef QSORT_R_USING_QSORT_S
+        static int compare(void* _this, const void *a, const void *b);
+#else
         static int compare(const void *a, const void *b, void* _this);
+#endif
 };
 
+#ifdef QSORT_R_USING_QSORT_S
+int VMVEComparator::compare(void* _this, const void *a, const void *b)
+#else
 int VMVEComparator::compare(const void *a, const void *b, void* _this)
+#endif
 {
         VMachine *vm = ((VMVEComparator*)_this)->vm;