diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2014-06-19 11:47:49 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2014-06-19 11:47:49 +0100 |
| commit | 126ef72d05b4a665d4d1cbcc889fda375e13767a (patch) | |
| tree | be5395e8bf2130cd3434fa3491639c270d051f83 /libs/pbd/file_utils.cc | |
| parent | 9f4f9c205d02486578da9e79e3257a8dc9ae02b3 (diff) | |
Move the definition for 'strtok_r' (to avoid clashing with a different definition in pthread_win32)
Diffstat (limited to 'libs/pbd/file_utils.cc')
| -rw-r--r-- | libs/pbd/file_utils.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc index dba185ba79..544daa2e15 100644 --- 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" |