diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-04-27 09:59:12 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-04-27 09:59:12 +0200 |
| commit | 7e04d257eb2f0cf89f07a161e7ac3762366c5da2 (patch) | |
| tree | e08fea906b88d0aa8efd72835e8cea713d2ce9cd /include/my_pthread.h | |
| parent | 20cf8f82eefbc4db26ec50aef4f602c991811397 (diff) | |
| download | mariadb-git-7e04d257eb2f0cf89f07a161e7ac3762366c5da2.tar.gz | |
Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable
- Changed makelist.sh
- Bump up required version of autoconf
- Use new style to init mutex in my_thr_init
cmd-line-utils/libedit/makelist.sh:
Changed file so it works also on windows cr/lf files.
configure.in:
Bump up required AC version number so that correct version of aclocal and autoconf is selected.
include/my_pthread.h:
Use PTHREAD_MUTEX_ADAPTIVE_NP to see if "fast" mutexes are available
Remove "errorcheck" mutexes, since they are never used.
mysys/my_thr_init.c:
Use new style functions to init mutex if PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP is defined
Add comment what mutex "kind" means
Diffstat (limited to 'include/my_pthread.h')
| -rw-r--r-- | include/my_pthread.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index f8cd3e0de71..b5b282238ba 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -604,19 +604,13 @@ extern int my_rw_trywrlock(my_rw_lock_t *); #define pthread_attr_setstacksize(A,B) pthread_dummy(0) #endif -/* Define mutex types */ +/* Define mutex types, see my_thr_init.c */ #define MY_MUTEX_INIT_SLOW NULL -#define MY_MUTEX_INIT_FAST NULL -#define MY_MUTEX_INIT_ERRCHK NULL #ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP extern pthread_mutexattr_t my_fast_mutexattr; -#undef MY_MUTEX_INIT_FAST #define MY_MUTEX_INIT_FAST &my_fast_mutexattr -#endif -#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP -extern pthread_mutexattr_t my_errchk_mutexattr; -#undef MY_INIT_MUTEX_ERRCHK -#define MY_INIT_MUTEX_ERRCHK &my_errchk_mutexattr +#else +#define MY_MUTEX_INIT_FAST NULL #endif extern my_bool my_thread_global_init(void); |