diff options
Diffstat (limited to 'ext/mysql/libmysql/thr_alarm.h')
| -rw-r--r-- | ext/mysql/libmysql/thr_alarm.h | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/ext/mysql/libmysql/thr_alarm.h b/ext/mysql/libmysql/thr_alarm.h index 0c268c09f0..b2c599f697 100644 --- a/ext/mysql/libmysql/thr_alarm.h +++ b/ext/mysql/libmysql/thr_alarm.h @@ -1,19 +1,5 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ +/* 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 */ @@ -23,13 +9,6 @@ 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 @@ -67,10 +46,10 @@ typedef struct st_win_timer #else -#ifdef __WIN__ +#ifdef __WIN32__ typedef struct st_win_timer { - rf_SetTimer crono; + uint crono; } thr_alarm_t; bool thr_got_alarm(thr_alarm_t *alrm); @@ -87,9 +66,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 /* __WIN__ */ +#endif /* __WIN32__ */ -bool thr_alarm(thr_alarm_t *alarmed,uint sec, ALARM *buff); +bool thr_alarm(thr_alarm_t *alarmed,uint sec); void thr_end_alarm(thr_alarm_t *alarmed); void end_thr_alarm(void); #endif /* DONT_USE_THR_ALARM */ |