From 40dc05e4ed2285b59e774c90f94b5db12421c9dc Mon Sep 17 00:00:00 2001
From: "Devin J. Pohly" <djpohly@gmail.com>
Date: Tue, 24 May 2016 11:52:45 -0400
Subject: [PATCH 1/2] CMake: check for timed pthreads functions

The macros
  HAVE_PTHREAD_MUTEX_TIMEDLOCK
  HAVE_PTHREAD_COND_TIMEDWAIT
are still being used in the Pthreads threading implementation, but the
CMake build system never sets them, so the timed versions aren't used.
This ended up making WorkerThread heartbeats not beat. </3
---
 StepmaniaCore.cmake | 3 +++
 src/config.in.hpp   | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/StepmaniaCore.cmake b/StepmaniaCore.cmake
index 6e33ee2531..6c94ae3681 100644
--- a/StepmaniaCore.cmake
+++ b/StepmaniaCore.cmake
@@ -231,6 +231,9 @@ find_package(Iconv)
 find_package(Threads)
 if (${Threads_FOUND})
   set(HAS_PTHREAD TRUE)
+  list(APPEND CMAKE_REQUIRED_LIBRARIES pthread)
+  check_symbol_exists(pthread_mutex_timedlock pthread.h HAVE_PTHREAD_MUTEX_TIMEDLOCK)
+  check_symbol_exists(pthread_cond_timedwait pthread.h HAVE_PTHREAD_COND_TIMEDWAIT)
 else()
   set(HAS_PTHREAD FALSE)
 endif()
diff --git a/src/config.in.hpp b/src/config.in.hpp
index a8fdd07910..d645221a7c 100644
--- a/src/config.in.hpp
+++ b/src/config.in.hpp
@@ -93,6 +93,12 @@
 /* Defined to 1 if the underlying system provides the posix_fadvise function. */
 #cmakedefine HAVE_POSIX_FADVISE 1
 
+/* Defined to 1 if the underlying system provides the pthread_mutex_timedlock function. */
+#cmakedefine HAVE_PTHREAD_MUTEX_TIMEDLOCK 1
+
+/* Defined to 1 if the underlying system provides the pthread_cond_timedwait function. */
+#cmakedefine HAVE_PTHREAD_MUTEX_TIMEDWAIT 1
+
 /* Provide a fallback if intptr_t is not defined. */
 #cmakedefine HAVE_SIZEOF_INTPTR_T 1
 #if !defined(HAVE_SIZEOF_INTPTR_T)

From a9bca762e0dd4ea757289f3a7fbcb45751a5a64c Mon Sep 17 00:00:00 2001
From: "Devin J. Pohly" <djpohly@gmail.com>
Date: Tue, 24 May 2016 12:39:04 -0400
Subject: [PATCH 2/2] d'oh, meant "cond"

---
 src/config.in.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config.in.hpp b/src/config.in.hpp
index d645221a7c..44be021359 100644
--- a/src/config.in.hpp
+++ b/src/config.in.hpp
@@ -97,7 +97,7 @@
 #cmakedefine HAVE_PTHREAD_MUTEX_TIMEDLOCK 1
 
 /* Defined to 1 if the underlying system provides the pthread_cond_timedwait function. */
-#cmakedefine HAVE_PTHREAD_MUTEX_TIMEDWAIT 1
+#cmakedefine HAVE_PTHREAD_COND_TIMEDWAIT 1
 
 /* Provide a fallback if intptr_t is not defined. */
 #cmakedefine HAVE_SIZEOF_INTPTR_T 1