Merge branch 'fix_win'

derwin12 · Jan 21, 2025 · cbe8c17 · cbe8c17
2 parents 3f3fe94 + 36adc49
commit cbe8c17
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/xSchedule/wxJSON/json_defs.h b/xSchedule/wxJSON/json_defs.h
@@ -194,11 +194,15 @@
 // key/value containers (see the docs: wxJSON internals: array and hash_map
 #undef wxJSON_USE_STL
 #if defined( wxUSE_STL ) && wxUSE_STL == 1
-// #define wxJSON_USE_STL
+#ifdef __WXMSW__
+#define wxJSON_USE_STL
+#endif
 #endif
 #ifndef wxJSON_USE_STL
 #if wxUSE_STD_CONTAINERS
-// #define wxJSON_USE_STL
+#ifdef __WXMSW__
+ #define wxJSON_USE_STL
+#endif
 #endif
 #endif