at 23.05-pre 2.3 kB view raw
1diff --git a/third_party/pthreadpool/CMakeLists.txt b/third_party/pthreadpool/CMakeLists.txt 2index 0db3264..1ba91c4 100644 3--- a/third_party/pthreadpool/CMakeLists.txt 4+++ b/third_party/pthreadpool/CMakeLists.txt 5@@ -74,9 +74,7 @@ IF(EMSCRIPTEN) 6 LIST(APPEND PTHREADPOOL_SRCS src/shim.c) 7 ELSE() 8 LIST(APPEND PTHREADPOOL_SRCS src/portable-api.c src/memory.c) 9- IF(APPLE AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "gcd")) 10- LIST(APPEND PTHREADPOOL_SRCS src/gcd.c) 11- ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|CYGWIN|MSYS)$" AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "event")) 12+ IF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|CYGWIN|MSYS)$" AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "event")) 13 LIST(APPEND PTHREADPOOL_SRCS src/windows.c) 14 ELSE() 15 LIST(APPEND PTHREADPOOL_SRCS src/pthreads.c) 16@@ -111,10 +109,6 @@ ELSEIF(PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "futex") 17 TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_FUTEX=1) 18 TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_GCD=0) 19 TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_EVENT=0) 20-ELSEIF(PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "gcd") 21- TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_FUTEX=0) 22- TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_GCD=1) 23- TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_EVENT=0) 24 ELSEIF(PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "event") 25 TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_FUTEX=0) 26 TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_GCD=0) 27diff --git a/third_party/pthreadpool/src/threadpool-common.h b/third_party/pthreadpool/src/threadpool-common.h 28index ca84744..244d0ca 100644 29--- a/third_party/pthreadpool/src/threadpool-common.h 30+++ b/third_party/pthreadpool/src/threadpool-common.h 31@@ -14,14 +14,6 @@ 32 #endif 33 #endif 34 35-#ifndef PTHREADPOOL_USE_GCD 36- #if defined(__APPLE__) 37- #define PTHREADPOOL_USE_GCD 1 38- #else 39- #define PTHREADPOOL_USE_GCD 0 40- #endif 41-#endif 42- 43 #ifndef PTHREADPOOL_USE_EVENT 44 #if defined(_WIN32) || defined(__CYGWIN__) 45 #define PTHREADPOOL_USE_EVENT 1