diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-30 19:34:54 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-30 19:34:54 +0300 |
| commit | 417c53ac5d26d4465d847d8c1a65b9847f8508a7 (patch) | |
| tree | a9b44d5572a490b782837b066152336770b59740 /include/my_pthread.h | |
| parent | 422d3873af935a3720ba869a866e17136dc2e99c (diff) | |
| parent | a86390f01ae108baf07707d401e35c3c4e1e9041 (diff) | |
| download | mariadb-git-417c53ac5d26d4465d847d8c1a65b9847f8508a7.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
include/my_pthread.h:
Auto merged
Diffstat (limited to 'include/my_pthread.h')
| -rw-r--r-- | include/my_pthread.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 0908f7b8ab9..038030540e8 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -429,6 +429,7 @@ struct tm *localtime_r(const time_t *clock, struct tm *res); #endif /* defined(__WIN__) */ #if defined(HPUX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS) +#undef pthread_cond_timedwait #define pthread_cond_timedwait(a,b,c) my_pthread_cond_timedwait((a),(b),(c)) #define pthread_mutex_trylock(a) my_pthread_mutex_trylock((a)) int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, |