Move the definition for 'strtok_r' (to avoid clashing with a different definition in pthread_win32)

2014-06-19 11:47:49 +01:00
parent 9f4f9c205d
commit 126ef72d05
1 changed files with 1 additions and 4 deletions
--- a/libs/pbd/file_utils.cc
+++ b/libs/pbd/file_utils.cc
@@ -26,6 +26,7 @@

 #ifdef COMPILER_MINGW
 #include <io.h> // For W_OK
+#define strtok_r strtok_s
 #endif

 #include <glibmm/fileutils.h>
@@ -50,10 +51,6 @@
 #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"