Corrections for Checking Threads

diff --git a/meson.build b/meson.build
index 9bae7ec049e753c15707e5e818a607c73cef4f5a..4899ef955c3dd42a09f68068f18d4f707697d81b 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -165,13 +165,10 @@ vkh_src = [
     'src/vkh_presenter.c',
     'src/vkh_queue.c',
     'src/vkhelpers.c',
-    'src/VmaUsage.cpp'
+    'src/VmaUsage.cpp',
+    'src/deps/tinycthread.c'
 ]
 
-if (has_c11_threads_support == false)
-    vkh_src += 'src/deps/tinycthread.c'
-endif
-
 vkh_include = [
     'include',
     'src',
@@ -179,8 +176,8 @@ vkh_include = [
 ]
 
 vkh_shared_library = shared_library('vkh', 
-    c_args: [vkh_compile_options, has_c11_threads_support_defines, '-DVKH_SHARED_BUILD'],
-    cpp_args: [vkh_compile_options, has_c11_threads_support_defines, '-DVKH_SHARED_BUILD'],
+    c_args: [vkh_compile_options, '-DVKH_SHARED_BUILD'],
+    cpp_args: [vkh_compile_options, '-DVKH_SHARED_BUILD'],
     build_by_default: true,
     install: true,
     soversion: lib_so_version,
@@ -190,8 +187,8 @@ vkh_shared_library = shared_library('vkh',
 )
 
 vkh_static_library = static_library('vkh', 
-    c_args: [vkh_compile_options, has_c11_threads_support_defines, '-DVKH_STATIC_BUILD'],
-    cpp_args: [vkh_compile_options, has_c11_threads_support_defines, '-DVKH_STATIC_BUILD'],
+    c_args: [vkh_compile_options, '-DVKH_STATIC_BUILD'],
+    cpp_args: [vkh_compile_options, '-DVKH_STATIC_BUILD'],
     build_by_default: true,
     install: true,
     sources: vkh_src,

diff --git a/src/deps/tinycthread.c b/src/deps/tinycthread.c
index 6a457848729d225a279d4679382f986ebde5f272..124579a6496369d51063ae0781bba9ac8a712952 100644 (file)
--- a/src/deps/tinycthread.c
+++ b/src/deps/tinycthread.c
@@ -21,7 +21,7 @@ freely, subject to the following restrictions:
     distribution.
 */
 
-#if defined(STDC_VERSION) && (STDC_VERSION >= 201102L) && !defined(STDC_NO_THREADS)
+#if defined(STDC_NO_THREADS)
 /* 2013-01-06 Camilla Löwy <elmindreda@glfw.org>
  *
  * Added casts from time_t to DWORD to avoid warnings on VC++.

diff --git a/src/deps/tinycthread.h b/src/deps/tinycthread.h
index 71b3e725c289fe2784ab569b78ec1a7addaea6d1..4c8112183c0093cc5896d1f58a3b480e800e2d2a 100644 (file)
--- a/src/deps/tinycthread.h
+++ b/src/deps/tinycthread.h
@@ -23,7 +23,7 @@ freely, subject to the following restrictions:
 
 #ifndef _TINYCTHREAD_H_
 #define _TINYCTHREAD_H_
-#if defined(STDC_VERSION) && (STDC_VERSION >= 201102L) && !defined(STDC_NO_THREADS)
+#if defined(STDC_NO_THREADS)
 /**
 * @file
 * @mainpage TinyCThread API Reference