summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <greg@mysql.com>2003-03-24 21:08:54 -0500
committerunknown <greg@mysql.com>2003-03-24 21:08:54 -0500
commit40c367b3c1f0ca96b81ac49497914cc9d4a0ff0a (patch)
tree4949b4a4018e1a9a01b7448765658610fb467126 /include
parent6f063d33693356389f3e64e9a719f348fec218aa (diff)
parent2ec4163759bc19f5fc03cd5a0b1072afcdb16947 (diff)
downloadmariadb-git-40c367b3c1f0ca96b81ac49497914cc9d4a0ff0a.tar.gz
Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/mysql-4.0
Diffstat (limited to 'include')
-rw-r--r--include/my_pthread.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h
index a7fa38349dc..0b41dc18fe1 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -356,14 +356,6 @@ extern int my_pthread_cond_timedwait(pthread_cond_t *cond,
#define pthread_cond_timedwait(A,B,C) my_pthread_cond_timedwait((A),(B),(C))
#endif
-
-#ifdef __NETWARE__
-extern int my_pthread_cond_timedwait(pthread_cond_t *cond,
- pthread_mutex_t *mutex,
- struct timespec *abstime);
-#define pthread_cond_timedwait(A,B,C) my_pthread_cond_timedwait((A),(B),(C))
-#endif /* __NETWARE__ */
-
#if defined(OS2)
#define my_pthread_getspecific(T,A) ((T) &(A))
#define pthread_setspecific(A,B) win_pthread_setspecific(&(A),(B),sizeof(A))