diff options
author | monty@hundin.mysql.fi <> | 2002-05-19 11:10:06 +0300 |
---|---|---|
committer | monty@hundin.mysql.fi <> | 2002-05-19 11:10:06 +0300 |
commit | 3cfdd984f0caa2dc76ed379eec2465b5a60736a9 (patch) | |
tree | 7d6cac7d6357418f6b85ae82dcdb0e7532fca077 /mysys/my_pthread.c | |
parent | ce1353a4541243c73d1c8b45e44717d577c8cf5a (diff) | |
parent | b716c18192f3618a3b583f3b69cc50da06e5d5fb (diff) | |
download | mariadb-git-3cfdd984f0caa2dc76ed379eec2465b5a60736a9.tar.gz |
merge
Diffstat (limited to 'mysys/my_pthread.c')
-rw-r--r-- | mysys/my_pthread.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index 0ac35123ad0..747a07e71b2 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -432,6 +432,7 @@ int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, } #endif + #ifdef HPUX int my_pthread_mutex_trylock(pthread_mutex_t *mutex) { |