Commit 73cc2fec authored by Eric Engestrom's avatar Eric Engestrom

mesa/imports: let the build system detect strtok_r()

Closes: mesa/mesa#2013Signed-off-by: Eric Engestrom's avatarEric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Matt Turner's avatarMatt Turner <mattst88@gmail.com>
Tested-by: Prodea Alexandru-Liviu's avatarProdea Alexandru-Liviu <liviuprodea@yahoo.com>
Reviewed-by: Dylan Baker's avatarDylan Baker <dylan@pnwbakers.com>
parent 66dd5358
......@@ -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
......
......@@ -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.
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment