From: Tapani Pälli <tapani.palli@intel.com>
Date: Wed, 30 Sep 2015 17:38:13 +0000 (+0300)
Subject: mesa: use strtok_s for strtok_r on windows
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ca2e16d26ec46e604c76ab72d3ec14a7a8643cc8;p=mesa.git

mesa: use strtok_s for strtok_r on windows

https://msdn.microsoft.com/en-us/library/ftsafwz3.aspx

v2: use _WIN32 instead of _MSC_VER (Brian Paul)

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92183
Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index d61279ac4e5..90247587be3 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -423,6 +423,9 @@ _mesa_vsnprintf(char *str, size_t size, const char *fmt, va_list arg);
 #define snprintf _snprintf
 #endif
 
+#if defined(_WIN32) && !defined(strtok_r)
+#define strtok_r strtok_s
+#endif
 
 #ifdef __cplusplus
 }