smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
John Emmas 2014-06-19 11:47:49 +01:00
parent 9f4f9c205d
commit 126ef72d05
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libs/pbd/file_utils.cc
View file

@ -26,6 +26,7 @@
#ifdef COMPILER_MINGW #ifdef COMPILER_MINGW
#include <io.h> // For W_OK #include <io.h> // For W_OK
#define strtok_r strtok_s
#endif #endif
#include <glibmm/fileutils.h> #include <glibmm/fileutils.h>
@ -50,10 +51,6 @@
#include <regex.h> #include <regex.h>
#endif #endif
#ifdef PLATFORM_WINDOWS
#define strtok_r strtok_s
#endif
#include "pbd/compose.h" #include "pbd/compose.h"
#include "pbd/file_utils.h" #include "pbd/file_utils.h"
#include "pbd/debug.h" #include "pbd/debug.h"