commit 2e3d0dd6c8f405f27d68b1ac35e928233bf8b89c
author Nicolai Hähnle <nicolai.haehnle@amd.com> Wed Nov 15 12:41:58 2017 +0100
committer Nicolai Hähnle <nicolai.haehnle@amd.com> Thu Nov 16 06:45:35 2017 +0100
tree 547b3b7677d9d5879504885c45eaefe498691280
parent a8bdf0e0c4c792634551c14e2dd02d72b75a8db5

threads,configure.ac,meson.build: define and use HAVE_TIMESPEC_GET

Tested with Travis and Appveyor.

v2: add HAVE_TIMESPEC_GET for non-Windows Scons builds
v3: use check_functions in Scons (Eric)

Cc: Rob Herring <robh@kernel.org>
Cc: Alexander von Gluck IV <kallisti5@unixzen.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103674
Fixes: f1a364878431 ("threads: update for late C11 changes")
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk> (v2)

configure.ac

diff --git a/configure.ac b/configure.ac
index 411c4f6..a7ae920 100644
--- a/configure.ac
+++ b/configure.ac
@@ -848,6 +848,7 @@
 AC_CHECK_HEADER([sys/sysctl.h], [DEFINES="$DEFINES -DHAVE_SYS_SYSCTL_H"])
 AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"])
 AC_CHECK_FUNC([mkostemp], [DEFINES="$DEFINES -DHAVE_MKOSTEMP"])
+AC_CHECK_FUNC([timespec_get], [DEFINES="$DEFINES -DHAVE_TIMESPEC_GET"])
 
 AC_MSG_CHECKING([whether strtod has locale support])
 AC_LINK_IFELSE([AC_LANG_SOURCE([[

include/c11/threads_posix.h

diff --git a/include/c11/threads_posix.h b/include/c11/threads_posix.h
index 2d7ac13..45cb607 100644
--- a/include/c11/threads_posix.h
+++ b/include/c11/threads_posix.h
@@ -382,7 +382,7 @@
 
 /*-------------------- 7.25.7 Time functions --------------------*/
 // 7.25.6.1
-#ifdef __HAIKU__
+#ifndef HAVE_TIMESPEC_GET
 static inline int
 timespec_get(struct timespec *ts, int base)
 {

meson.build

diff --git a/meson.build b/meson.build
index 1c42007..7fdc3c2 100644
--- a/meson.build
+++ b/meson.build
@@ -578,7 +578,7 @@
   endif
 endforeach
 
-foreach f : ['strtof', 'mkostemp', 'posix_memalign']
+foreach f : ['strtof', 'mkostemp', 'posix_memalign', 'timespec_get']
   if cc.has_function(f)
     pre_args += '-DHAVE_@0@'.format(f.to_upper())
   endif

scons/gallium.py

diff --git a/scons/gallium.py b/scons/gallium.py
index 94022df..ef3b2ee 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -355,6 +355,9 @@
         if check_functions(env, ['strtod_l', 'strtof_l']):
             cppdefines += ['HAVE_STRTOD_L']
 
+        if check_functions(env, ['timespec_get']):
+            cppdefines += ['HAVE_TIMESPEC_GET']
+
     if platform == 'windows':
         cppdefines += [
             'WIN32',