Skip to content

Commit

Permalink
Merge pull request #1488 from dgelessus/remove_pthread_timedjoin_np
Browse files Browse the repository at this point in the history
Remove no longer used check for `pthread_timedjoin_np`
  • Loading branch information
zrax authored Sep 20, 2023
2 parents 8009e89 + 76c336f commit f3d2ab3
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 19 deletions.
5 changes: 0 additions & 5 deletions Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@ You can contact Cyan Worlds, Inc. by email [email protected]

#include "Pch.h"

#if defined(HAVE_PTHREAD_TIMEDJOIN_NP)
#include <pthread.h>
#include <time.h>
#endif

static void CreateThreadProc(AsyncThreadRef thread)
{
#ifdef USE_VLD
Expand Down
4 changes: 0 additions & 4 deletions cmake/CompilerChecks.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
9 changes: 0 additions & 9 deletions cmake/check_pthread_timedjoin_np.cpp

This file was deleted.

1 change: 0 additions & 1 deletion cmake/hsConfig.h.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ You can contact Cyan Worlds, Inc. by email [email protected]
#cmakedefine USE_VPX
#cmakedefine USE_WEBM

#cmakedefine HAVE_PTHREAD_TIMEDJOIN_NP
#cmakedefine HAVE_SYSCTL
#cmakedefine HAVE_SYSDIR
#cmakedefine HAVE_SYSINFO
Expand Down

0 comments on commit f3d2ab3

Please sign in to comment.