Added few more stubs so that control reaches to DestroyDevice().

[mesa.git] / src / util / u_string.h

diff --git a/src/util/u_string.h b/src/util/u_string.h
index 361dcb41e2bec42abee2c36138a8aca439830306..88df2cceda66681d02e6b8c2f9752bce7f845080 100644 (file)
--- a/src/util/u_string.h
+++ b/src/util/u_string.h
@@ -50,7 +50,7 @@
 extern "C" {
 #endif
 
-#ifndef _GNU_SOURCE
+#if !defined(_GNU_SOURCE) || defined(__APPLE__)
 
 #define strchrnul util_strchrnul
 static inline char *
@@ -116,6 +116,10 @@ util_asprintf(char **str, const char *fmt, ...)
 
 #define strdup _strdup
 
+#if defined(_WIN32) && !defined(HAVE_STRTOK_R)
+#define strtok_r strtok_s
+#endif
+
 #endif