From 369f00259113d5c157b88d52bd002d292c21fedf Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 10 Sep 2018 10:26:26 -0700 Subject: [PATCH] move windows strtok_r define to u_string MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This makes more sense for it, it's only used in the glsl compiler currently, so we could probably move it there, but this seems fine for a header only #define. Reviewed-by: Marek Olšák Reviewed-by: Kristian H. Kristensen Reviewed-by: Matt Turner Part-of: --- src/util/imports.h | 4 ---- src/util/u_string.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/imports.h b/src/util/imports.h index 149bb225ad4..9556223b3ba 100644 --- a/src/util/imports.h +++ b/src/util/imports.h @@ -119,10 +119,6 @@ extern int _mesa_vsnprintf(char *str, size_t size, const char *fmt, va_list arg); -#if defined(_WIN32) && !defined(HAVE_STRTOK_R) -#define strtok_r strtok_s -#endif - #ifdef __cplusplus } #endif diff --git a/src/util/u_string.h b/src/util/u_string.h index cd21f9d1af1..88df2cceda6 100644 --- a/src/util/u_string.h +++ b/src/util/u_string.h @@ -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 -- 2.30.2