From 76c336f0e4764f6aa770db1827d69e95e7878f20 Mon Sep 17 00:00:00 2001 From: dgelessus Date: Wed, 20 Sep 2023 01:27:30 +0200 Subject: [PATCH] Remove no longer used check for pthread_timedjoin_np No longer needed as of c70211a327682fbe11c73f8241dcd361ef2e6224 (#1205). --- Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceThread.cpp | 5 ----- cmake/CompilerChecks.cmake | 4 ---- cmake/check_pthread_timedjoin_np.cpp | 9 --------- cmake/hsConfig.h.cmake | 1 - 4 files changed, 19 deletions(-) delete mode 100644 cmake/check_pthread_timedjoin_np.cpp diff --git a/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceThread.cpp b/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceThread.cpp index 5eeec9e39a..8e0834235b 100644 --- a/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceThread.cpp +++ b/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceThread.cpp @@ -47,11 +47,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "Pch.h" -#if defined(HAVE_PTHREAD_TIMEDJOIN_NP) -#include -#include -#endif - static void CreateThreadProc(AsyncThreadRef thread) { #ifdef USE_VLD diff --git a/cmake/CompilerChecks.cmake b/cmake/CompilerChecks.cmake index 72990175e8..a710eab05b 100644 --- a/cmake/CompilerChecks.cmake +++ b/cmake/CompilerChecks.cmake @@ -11,10 +11,6 @@ if(NOT DEFINED CMAKE_INTERPROCEDURAL_OPTIMIZATION) endif() endif() -try_compile(HAVE_PTHREAD_TIMEDJOIN_NP ${PROJECT_BINARY_DIR} - ${PROJECT_SOURCE_DIR}/cmake/check_pthread_timedjoin_np.cpp - LINK_LIBRARIES Threads::Threads) - # Check for Linux sysinfo. include(CheckCXXSymbolExists) check_cxx_symbol_exists("sysinfo" "sys/sysinfo.h" HAVE_SYSINFO) diff --git a/cmake/check_pthread_timedjoin_np.cpp b/cmake/check_pthread_timedjoin_np.cpp deleted file mode 100644 index f0c90bb266..0000000000 --- a/cmake/check_pthread_timedjoin_np.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include - -int main() -{ - pthread_t thread; - struct timespec ts{}; - return pthread_timedjoin_np(thread, nullptr, &ts); -} diff --git a/cmake/hsConfig.h.cmake b/cmake/hsConfig.h.cmake index 06c2d3067f..19d66b4145 100644 --- a/cmake/hsConfig.h.cmake +++ b/cmake/hsConfig.h.cmake @@ -63,7 +63,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #cmakedefine USE_VPX #cmakedefine USE_WEBM -#cmakedefine HAVE_PTHREAD_TIMEDJOIN_NP #cmakedefine HAVE_SYSCTL #cmakedefine HAVE_SYSDIR #cmakedefine HAVE_SYSINFO