From e5b660487bf584504fab2e6a0e114a3919fe34a0 Mon Sep 17 00:00:00 2001
From: "serg@janus.mylan" <>
Date: Wed, 28 Mar 2007 15:33:29 +0200
Subject: restored run-time thread lib detection

---
 include/my_pthread.h | 9 +++++++++
 include/thr_alarm.h  | 8 +++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/my_pthread.h b/include/my_pthread.h
index 4df105e1b20..340dc32981a 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -701,6 +701,15 @@ extern uint my_thread_end_wait_time;
   Keep track of shutdown,signal, and main threads so that my_end() will not
   report errors with them
 */
+
+/* Which kind of thread library is in use */
+
+#define THD_LIB_OTHER 1
+#define THD_LIB_NPTL  2
+#define THD_LIB_LT    4
+
+extern uint thd_lib_detected;
+
 	/* statistics_xxx functions are for not essential statistic */
 
 #ifndef thread_safe_increment
diff --git a/include/thr_alarm.h b/include/thr_alarm.h
index 14dd538c9e4..a2694ba105b 100644
--- a/include/thr_alarm.h
+++ b/include/thr_alarm.h
@@ -24,11 +24,6 @@ extern "C" {
 #ifndef USE_ALARM_THREAD
 #define USE_ONE_SIGNAL_HAND		/* One must call process_alarm */
 #endif
-#ifdef HAVE_LINUXTHREADS
-#define THR_CLIENT_ALARM SIGALRM
-#else
-#define THR_CLIENT_ALARM SIGUSR1
-#endif
 #ifdef HAVE_rts_threads
 #undef USE_ONE_SIGNAL_HAND
 #define USE_ALARM_THREAD
@@ -90,6 +85,9 @@ typedef struct st_alarm {
   my_bool malloced;
 } ALARM;
 
+extern uint thr_client_alarm;
+extern pthread_t alarm_thread;
+
 #define thr_alarm_init(A) (*(A))=0
 #define thr_alarm_in_use(A) (*(A)!= 0)
 void init_thr_alarm(uint max_alarm);
-- 
cgit v1.2.1