diff options
author | unknown <greg@mysql.com> | 2003-03-21 16:45:39 -0500 |
---|---|---|
committer | unknown <greg@mysql.com> | 2003-03-21 16:45:39 -0500 |
commit | 2ec4163759bc19f5fc03cd5a0b1072afcdb16947 (patch) | |
tree | 6204247b50ae737bead82de5fdfbc3bdd63689b1 /include | |
parent | 0f18ab78970cd64418646e83a32d7e487477fb86 (diff) | |
download | mariadb-git-2ec4163759bc19f5fc03cd5a0b1072afcdb16947.tar.gz |
Post-4.0.12 changes from Novell: mostly NetWare-related code changes to utilize new LibC
client/mysql.cc:
Remove unnecessary pthread_yield calls for NetWare
client/mysqldump.c:
Remove unnecessary pthread_yield calls for NetWare
include/my_pthread.h:
Special extern my_pthread_cond_timedwait no longer required for NetWare
mysql-test/t/backup.test:
replace_result added so test passes correctly on NetWare
mysys/default.c:
Add conditional to avoid non-applicable file checking on NetWare
mysys/my_init.c:
Remove working directory change from netware_init()
mysys/my_pthread.c:
Remove unnecessary NetWare version of my_pthread_cond_timedwait
mysys/thr_mutex.c:
Remove unnecessary NetWare block
scripts/make_binary_distribution.sh:
Changes to clear up extraneous EXTRA_BIN_FILES, NetWare sections
Diffstat (limited to 'include')
-rw-r--r-- | include/my_pthread.h | 8 |
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)) |