diff options
| -rw-r--r-- | include/config-win.h | 2 | ||||
| -rw-r--r-- | mysys/my_thr_init.c | 3 | ||||
| -rw-r--r-- | mysys/thr_alarm.c | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/include/config-win.h b/include/config-win.h index 42aa23c3afe..3adb940aa4f 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -167,7 +167,7 @@ typedef uint rf_SetTimer; /* Convert some simple functions to Posix */ -#define sigset(A,B) signal((A),(B)) +#define my_sigset(A,B) signal((A),(B)) #define finite(A) _finite(A) #define sleep(A) Sleep((A)*1000) diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c index 5729f27b7a7..f4fd96b769d 100644 --- a/mysys/my_thr_init.c +++ b/mysys/my_thr_init.c @@ -60,11 +60,14 @@ static uint get_thread_lib(void); my_bool my_thread_global_init(void) { +#if defined(SIGALRM) || defined(SIGUSR1) + /* On Windows, these signals are not defined, but this whole part is not needed. */ thd_lib_detected= get_thread_lib(); if (thd_lib_detected == THD_LIB_LT) thr_client_alarm= SIGALRM; else thr_client_alarm= SIGUSR1; +#endif if (pthread_key_create(&THR_KEY_mysys,0)) { diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index 8f342e269de..c8e1e55aac2 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -37,7 +37,6 @@ #define ETIME ETIMEDOUT #endif -uint thr_client_alarm; static int alarm_aborted=1; /* No alarm thread */ my_bool thr_alarm_inited= 0; volatile my_bool alarm_thread_running= 0; |