diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-09-10 10:26:26 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-04-21 11:09:03 -0700 |
| commit | 369f00259113d5c157b88d52bd002d292c21fedf (patch) | |
| tree | c9bcc9d456205fc625a01ed597eb17a33fead5e1 /src | |
| parent | 53c36dfcfe3eb3749a53267f054870280afb0d71 (diff) | |
move windows strtok_r define to u_string
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 <marek.olsak@amd.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3024>
Diffstat (limited to 'src')
| -rw-r--r-- | src/util/imports.h | 4 | ||||
| -rw-r--r-- | 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 |