summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt8
-rw-r--r--source/kit/threads.h8
-rw-r--r--source/kit/threads.posix.c2
-rw-r--r--source/test/unittests/test_duration.test.c2
4 files changed, 4 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b96abd8..b8b5d20 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,14 +101,6 @@ if(KIT_HAVE_TIMESPEC_GET)
target_compile_definitions(${KIT_LIBRARY} PUBLIC KIT_HAVE_TIMESPEC_GET)
endif()
-if(KIT_HAVE_PTHREAD)
- target_compile_definitions(${KIT_LIBRARY} PUBLIC KIT_HAVE_PTHREAD)
-endif()
-
-if(KIT_HAVE_WINDOWS)
- target_compile_definitions(${KIT_LIBRARY} PUBLIC KIT_HAVE_WINDOWS)
-endif()
-
if(KIT_DISABLE_SYSTEM_MALLOC)
target_compile_definitions(${KIT_LIBRARY} PUBLIC KIT_DISABLE_SYSTEM_MALLOC)
endif()
diff --git a/source/kit/threads.h b/source/kit/threads.h
index d98978d..584ac7c 100644
--- a/source/kit/threads.h
+++ b/source/kit/threads.h
@@ -48,11 +48,9 @@
# if defined(_WIN32) && !defined(__CYGWIN__)
# include <io.h> /* close */
# include <process.h> /* _exit */
-# elif defined(KIT_HAVE_PTHREAD)
+# else
# include <pthread.h>
# include <unistd.h> /* close, _exit */
-# else
-# error Not supported on this platform.
# endif
/*---------------------------- macros ---------------------------*/
@@ -123,7 +121,7 @@ typedef struct {
# define ONCE_FLAG_INIT \
{ 0 }
# define TSS_DTOR_ITERATIONS 1
-# elif defined(KIT_HAVE_PTHREAD)
+# else
typedef pthread_cond_t cnd_t;
typedef pthread_t thrd_t;
typedef pthread_key_t tss_t;
@@ -138,8 +136,6 @@ typedef pthread_once_t once_flag;
# define TSS_DTOR_ITERATIONS \
1 // assume TSS dtor MAY be called at least once.
# endif
-# else
-# error Not supported on this platform.
# endif
/*-------------------- enumeration constants --------------------*/
diff --git a/source/kit/threads.posix.c b/source/kit/threads.posix.c
index 20ef1ae..f8c20f9 100644
--- a/source/kit/threads.posix.c
+++ b/source/kit/threads.posix.c
@@ -30,7 +30,7 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef KIT_DISABLE_SYSTEM_THREADS
-# ifdef KIT_HAVE_PTHREAD
+# if !defined(_WIN32) || defined(__CYGWIN__)
# include <assert.h>
# include <errno.h>
diff --git a/source/test/unittests/test_duration.test.c b/source/test/unittests/test_duration.test.c
index 58faf4a..5d9e578 100644
--- a/source/test/unittests/test_duration.test.c
+++ b/source/test/unittests/test_duration.test.c
@@ -1,7 +1,7 @@
#define KIT_TEST_FILE test_duration
#include "../../kit_test/test.h"
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__CYGWIN__)
__declspec(dllimport) void __stdcall Sleep(unsigned long timeout);
static void kit_sleep(int ms) {
Sleep(ms);