From 126ef72d05b4a665d4d1cbcc889fda375e13767a Mon Sep 17 00:00:00 2001
From: John Emmas <johne53@tiscali.co.uk>
Date: Thu, 19 Jun 2014 11:47:49 +0100
Subject: Move the definition for 'strtok_r' (to avoid clashing with a
 different definition in pthread_win32)

---
 libs/pbd/file_utils.cc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'libs/pbd/file_utils.cc')

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"
-- 
cgit v1.2.3