diff options
Diffstat (limited to 'include/thr_alarm.h')
| -rw-r--r-- | include/thr_alarm.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/include/thr_alarm.h b/include/thr_alarm.h index fe0a8f21b92..fb906039269 100644 --- a/include/thr_alarm.h +++ b/include/thr_alarm.h @@ -67,14 +67,6 @@ typedef struct st_thr_alarm_entry rf_SetTimer crono; } thr_alarm_entry; -#elif defined(__EMX__) || defined(OS2) - -typedef struct st_thr_alarm_entry -{ - uint crono; - uint event; -} thr_alarm_entry; - #else /* System with posix threads */ typedef int thr_alarm_entry; @@ -89,6 +81,7 @@ typedef struct st_alarm { ulong expire_time; thr_alarm_entry alarmed; /* set when alarm is due */ pthread_t thread; + my_thread_id thread_id; my_bool malloced; } ALARM; @@ -100,12 +93,12 @@ extern pthread_t alarm_thread; void init_thr_alarm(uint max_alarm); void resize_thr_alarm(uint max_alarms); my_bool thr_alarm(thr_alarm_t *alarmed, uint sec, ALARM *buff); -void thr_alarm_kill(pthread_t thread_id); +void thr_alarm_kill(my_thread_id thread_id); void thr_end_alarm(thr_alarm_t *alarmed); void end_thr_alarm(my_bool free_structures); sig_handler process_alarm(int); #ifndef thr_got_alarm -bool thr_got_alarm(thr_alarm_t *alrm); +my_bool thr_got_alarm(thr_alarm_t *alrm); #endif |