diff options
| author | unknown <serg@janus.mylan> | 2007-03-28 15:33:29 +0200 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-03-28 15:33:29 +0200 |
| commit | f8eed3c1cef8049a81839fb8d526719437bc0d0b (patch) | |
| tree | 7792d65ad629928aed16128c025294a9afd94492 /include/thr_alarm.h | |
| parent | 143151229f0fc7954c3135cddde87b34e4e9f73c (diff) | |
| download | mariadb-git-f8eed3c1cef8049a81839fb8d526719437bc0d0b.tar.gz | |
restored run-time thread lib detection
sql/stacktrace.c:
removed code duplication
sql/stacktrace.h:
removed code duplication
Diffstat (limited to 'include/thr_alarm.h')
| -rw-r--r-- | include/thr_alarm.h | 8 |
1 files changed, 3 insertions, 5 deletions
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); |