Detect whether pthread_t is a pointer or not.

Author: pphaneuf

configure.ac

@@ -74,6 +74,17 @@ AC_TYPE_UINT32_T
 AC_TYPE_UINT64_T
 AC_TYPE_UINT8_T
 
+AC_MSG_CHECKING([whether pthread_t is a pointer])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+#include <pthread.h>
+void TakesPointer(void*);
+], [TakesPointer(pthread_self())])], [PTHREAD_T_IS_POINTER=yes],
+   [PTHREAD_T_IS_POINTER=no])
+AC_MSG_RESULT([$PTHREAD_T_IS_POINTER])
+AS_IF([test "x$PTHREAD_T_IS_POINTER" = xyes],
+      [AC_DEFINE([PTHREAD_T_IS_POINTER], [],
+                 [Whether pthread_t is a pointer.])])
+
 # Checks for library functions.
 AC_FUNC_FORK
 AC_CHECK_FUNCS([alarm gettimeofday memset mkdir select socket strdup strerror strtol])

cpp/server/ct-server.cc

@@ -16,6 +16,8 @@
 #include <string>
 #include <unistd.h>
 
+
+#include "config.h"
 #include "log/cert_checker.h"
 #include "log/cert_submission_handler.h"
 #include "log/cluster_state_controller.h"
@@ -30,9 +32,9 @@
 #include "log/sqlite_db.h"
 #include "log/strict_consistent_store.h"
 #include "log/tree_signer.h"
+#include "monitoring/latency.h"
 #include "monitoring/monitoring.h"
 #include "monitoring/registry.h"
-#include "monitoring/latency.h"
 #include "server/handler.h"
 #include "server/json_output.h"
 #include "server/metrics.h"
@@ -383,9 +385,7 @@ void locking_function(int mode, int n, const char* file, int line) {
 
 
 void threadid_function(CRYPTO_THREADID* id) {
-  // FIXME(benl): platform differences should all live together somewhere,
-  // and ideally done by feature detection.
-#ifdef __FreeBSD__
+#ifdef PTHREAD_T_IS_POINTER
   CRYPTO_THREADID_set_pointer(id, pthread_self());
 #else
   CRYPTO_THREADID_set_numeric(id, pthread_self());