Merge sinisa@work.mysql.com:/home/bk/mysql-4.0

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
db8cf95a · Sinisa@sinisa.nasamreza.org · 65039ca9 · 07fd76a3 · db8cf95a
Commit db8cf95a authored May 28, 2002 by Sinisa@sinisa.nasamreza.org
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

mysys/my_pthread.c mysys/my_pthread.c +1 -0

No files found.
--- a/mysys/my_pthread.c
+++ b/mysys/my_pthread.c
@@ -419,6 +419,7 @@ int my_pthread_cond_init(pthread_cond_t *mp, const pthread_condattr_t *attr)
 ****************************************************************************/
 #if defined(HPUX) || defined(HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT)
+#undef pthread_cond_timedwait
 int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
 			      struct timespec *abstime)