diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-08 12:05:18 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-08 12:05:18 +0300 |
| commit | 6b56703a56c3d7289fa3ad89edd83ad4f408950b (patch) | |
| tree | e4fd56548f8b7114557c187ad8aa70c1c5c26d52 /include/my_pthread.h | |
| parent | 8d417fa8487cddec56e49ff614ff87a7a5ce3d86 (diff) | |
| parent | 7c375fe24c7e25d7df8615177da8286b5debadac (diff) | |
| download | mariadb-git-6b56703a56c3d7289fa3ad89edd83ad4f408950b.tar.gz | |
merge
configure.in:
Auto merged
include/my_pthread.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'include/my_pthread.h')
| -rw-r--r-- | include/my_pthread.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index ffda1a42cc4..9cf337702f7 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -430,8 +430,9 @@ struct tm *localtime_r(const time_t *clock, struct tm *res); #if defined(HPUX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS) #undef pthread_cond_timedwait +#undef pthread_mutex_trylock #define pthread_cond_timedwait(a,b,c) my_pthread_cond_timedwait((a),(b),(c)) -#define pthread_mutex_trylock(a) my_pthread_mutex_trylock((a)) +#define pthread_mutex_trylock(a) my_pthread_mutex_trylock((a)) int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, struct timespec *abstime); int my_pthread_mutex_trylock(pthread_mutex_t *mutex); |