diff options
Diffstat (limited to 'mysys/thr_alarm.c')
| -rw-r--r-- | mysys/thr_alarm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index 471ec0ab10d..81093be3678 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -60,7 +60,7 @@ static void *alarm_handler(void *arg); static sig_handler thread_alarm(int sig __attribute__((unused))); static int compare_ulong(void *not_used __attribute__((unused)), - byte *a_ptr,byte* b_ptr) + uchar *a_ptr,uchar* b_ptr) { ulong a=*((ulong*) a_ptr),b= *((ulong*) b_ptr); return (a < b) ? -1 : (a == b) ? 0 : 1; @@ -205,7 +205,7 @@ my_bool thr_alarm(thr_alarm_t *alrm, uint sec, ALARM *alarm_data) alarm_data->alarmed=0; alarm_data->thread= current_my_thread_var->pthread_self; alarm_data->thread_id= current_my_thread_var->id; - queue_insert(&alarm_queue,(byte*) alarm_data); + queue_insert(&alarm_queue,(uchar*) alarm_data); /* Reschedule alarm if the current one has more than sec left */ if (reschedule) @@ -237,14 +237,14 @@ void thr_end_alarm(thr_alarm_t *alarmed) pthread_sigmask(SIG_BLOCK,&full_signal_set,&old_mask); pthread_mutex_lock(&LOCK_alarm); - alarm_data= (ALARM*) ((byte*) *alarmed - offsetof(ALARM,alarmed)); + alarm_data= (ALARM*) ((uchar*) *alarmed - offsetof(ALARM,alarmed)); for (i=0 ; i < alarm_queue.elements ; i++) { if ((ALARM*) queue_element(&alarm_queue,i) == alarm_data) { queue_remove(&alarm_queue,i),MYF(0); if (alarm_data->malloced) - my_free((gptr) alarm_data,MYF(0)); + my_free((uchar*) alarm_data,MYF(0)); found++; #ifdef DBUG_OFF break; @@ -464,7 +464,7 @@ void thr_alarm_kill(my_thread_id thread_id) { ALARM *tmp=(ALARM*) queue_remove(&alarm_queue,i); tmp->expire_time=0; - queue_insert(&alarm_queue,(byte*) tmp); + queue_insert(&alarm_queue,(uchar*) tmp); reschedule_alarms(); break; } @@ -755,7 +755,7 @@ static void *test_thread(void *arg) thread_count--; VOID(pthread_cond_signal(&COND_thread_count)); /* Tell main we are ready */ pthread_mutex_unlock(&LOCK_thread_count); - free((gptr) arg); + free((uchar*) arg); return 0; } |