summaryrefslogtreecommitdiff
path: root/include/my_pthread.h
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-08-08 03:14:44 +0300
committerunknown <monty@hundin.mysql.fi>2002-08-08 03:14:44 +0300
commita9c47d8cfc9d93dd93409c3d3681a4f726a456e5 (patch)
treee700bcb0baacd3c2e36818839eb18c8744ddf5dd /include/my_pthread.h
parent7448e105224e2b3808789ab2b77e0268acf45321 (diff)
downloadmariadb-git-a9c47d8cfc9d93dd93409c3d3681a4f726a456e5.tar.gz
Fix for Intel compiler (ecc)
Minor cleanups to other patches. Make --temp-pool default Docs/manual.texi: Changelog configure.in: Fix for Intel compiler (ecc) include/my_global.h: Cleaned up QNX specific code. include/my_pthread.h: Safety include/my_semaphore.h: Cleaned up BSDI fix. mysys/my_pthread.c: Code comments mysys/my_semaphore.c: Fix for BSDI sql/mysqld.cc: Make --temp-pool default sql/sql_parse.cc: Safety
Diffstat (limited to 'include/my_pthread.h')
-rw-r--r--include/my_pthread.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h
index a822d2db484..576c18fa02d 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);