Module: Mesa Branch: master Commit: ca2e16d26ec46e604c76ab72d3ec14a7a8643cc8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca2e16d26ec46e604c76ab72d3ec14a7a8643cc8
Author: Tapani Pälli <tapani.pa...@intel.com> Date: Wed Sep 30 20:38:13 2015 +0300 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.pa...@intel.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92183 Reviewed-by: Brian Paul <bri...@vmware.com> --- src/mesa/main/imports.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h index d61279a..9024758 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 } _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
