summaryrefslogtreecommitdiff
path: root/ext/mysql/libmysql/thr_alarm.h
diff options
context:
space:
mode:
Diffstat (limited to 'ext/mysql/libmysql/thr_alarm.h')
-rw-r--r--ext/mysql/libmysql/thr_alarm.h19
1 files changed, 13 insertions, 6 deletions
diff --git a/ext/mysql/libmysql/thr_alarm.h b/ext/mysql/libmysql/thr_alarm.h
index b2c599f697..697d29e04c 100644
--- a/ext/mysql/libmysql/thr_alarm.h
+++ b/ext/mysql/libmysql/thr_alarm.h
@@ -1,5 +1,5 @@
-/* Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB
- This file is public domain and comes with NO WARRANTY of any kind */
+/* Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB
+This file is public domain and comes with NO WARRANTY of any kind */
/* Prototypes when using thr_alarm library functions */
@@ -9,6 +9,13 @@
extern "C" {
#endif
+typedef struct st_alarm {
+ ulong expire_time;
+ int alarmed; /* 1 when alarm is due */
+ pthread_t thread;
+ my_bool malloced;
+} ALARM;
+
#ifndef USE_ALARM_THREAD
#define USE_ONE_SIGNAL_HAND /* One must call process_alarm */
#endif
@@ -46,10 +53,10 @@ typedef struct st_win_timer
#else
-#ifdef __WIN32__
+#ifdef __WIN__
typedef struct st_win_timer
{
- uint crono;
+ rf_SetTimer crono;
} thr_alarm_t;
bool thr_got_alarm(thr_alarm_t *alrm);
@@ -66,9 +73,9 @@ typedef int* thr_alarm_t;
void init_thr_alarm(uint max_alarm);
void thr_alarm_kill(pthread_t thread_id);
sig_handler process_alarm(int);
-#endif /* __WIN32__ */
+#endif /* __WIN__ */
-bool thr_alarm(thr_alarm_t *alarmed,uint sec);
+bool thr_alarm(thr_alarm_t *alarmed,uint sec, ALARM *buff);
void thr_end_alarm(thr_alarm_t *alarmed);
void end_thr_alarm(void);
#endif /* DONT_USE_THR_ALARM */