diff options
| author | Eric Engestrom <[email protected]> | 2019-11-05 00:13:27 +0000 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2019-11-05 22:38:04 +0000 |
| commit | 73cc2fec10574816ff968b21183bd62e77517b66 (patch) | |
| tree | a48d502a1cec0fd7e0e41bcaa7590f9103c2a151 | |
| parent | 66dd53584e223f1e83e24349f26c7d9a4812faa3 (diff) | |
mesa/imports: let the build system detect strtok_r()
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2013
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Tested-by: Prodea Alexandru-Liviu <[email protected]>
Reviewed-by: Dylan Baker <[email protected]>
| -rw-r--r-- | meson.build | 2 | ||||
| -rwxr-xr-x | scons/gallium.py | 3 | ||||
| -rw-r--r-- | src/mesa/main/imports.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 457cc0c5fdc..b9a6da01d31 100644 --- a/meson.build +++ b/meson.build @@ -1149,7 +1149,7 @@ foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h', 'dlfcn.h' endif endforeach -foreach f : ['strtof', 'mkostemp', 'timespec_get', 'memfd_create', 'random_r', 'flock'] +foreach f : ['strtof', 'mkostemp', 'timespec_get', 'memfd_create', 'random_r', 'flock', 'strtok_r'] if cc.has_function(f) pre_args += '-DHAVE_@0@'.format(f.to_upper()) endif diff --git a/scons/gallium.py b/scons/gallium.py index b216304170f..c0f6f6c91ca 100755 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -381,6 +381,9 @@ def generate(env): if check_header(env, 'sys/shm.h'): cppdefines += ['HAVE_SYS_SHM_H'] + if check_functions(env, ['strtok_r']): + cppdefines += ['HAVE_STRTOK_R'] + #FIXME: we should really be checking for the major()/minor() # functions/macros in these headers, but check_functions()'s # SConf.CheckFunc() doesn't seem to support macros. diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h index 7f10ecec810..7cf5f247be4 100644 --- a/src/mesa/main/imports.h +++ b/src/mesa/main/imports.h @@ -309,7 +309,7 @@ extern int _mesa_vsnprintf(char *str, size_t size, const char *fmt, va_list arg); -#if defined(_WIN32) && !defined(strtok_r) +#if defined(_WIN32) && !defined(HAVE_STRTOK_R) #define strtok_r strtok_s #endif |