Move the definition for 'strtok_r' (to avoid clashing with a different definition...
authorJohn Emmas <johne53@tiscali.co.uk>
Thu, 19 Jun 2014 10:47:49 +0000 (11:47 +0100)
committerJohn Emmas <johne53@tiscali.co.uk>
Thu, 19 Jun 2014 10:47:49 +0000 (11:47 +0100)
libs/pbd/file_utils.cc

index dba185ba79e999000f69cd949b117689e8d4f5be..544daa2e152ca6cb84f00e2bcf30164e9200938c 100644 (file)
@@ -26,6 +26,7 @@
 
 #ifdef COMPILER_MINGW
 #include <io.h> // For W_OK
+#define strtok_r strtok_s
 #endif
 
 #include <glibmm/fileutils.h>
 #include <regex.h>
 #endif
 
-#ifdef PLATFORM_WINDOWS
-#define strtok_r strtok_s
-#endif
-
 #include "pbd/compose.h"
 #include "pbd/file_utils.h"
 #include "pbd/debug.h"