diff options
author | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-04 10:46:02 +0000 |
---|---|---|
committer | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-04 10:46:02 +0000 |
commit | 09f175faf45de531364cdb6f959ee6c146605caa (patch) | |
tree | 2a81955502f643d338d407b7f6c6cee3331366a8 /gcc/gthr-posix.h | |
parent | 9ea83aa5a7bb715c9d6a243cd09f84b95ab15056 (diff) | |
download | gcc-09f175faf45de531364cdb6f959ee6c146605caa.tar.gz |
PR other/18277
* gthr-posix.h (__gthread_recursive_mutex_init_function): Revert
2004-10-29 patch
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90057 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/gthr-posix.h')
-rw-r--r-- | gcc/gthr-posix.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gcc/gthr-posix.h b/gcc/gthr-posix.h index a46c65364e7..7cab6149f24 100644 --- a/gcc/gthr-posix.h +++ b/gcc/gthr-posix.h @@ -54,10 +54,8 @@ typedef pthread_mutex_t __gthread_recursive_mutex_t; #define __GTHREAD_RECURSIVE_MUTEX_INIT PTHREAD_RECURSIVE_MUTEX_INITIALIZER #elif defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP) #define __GTHREAD_RECURSIVE_MUTEX_INIT PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP -#elif defined(PTHREAD_MUTEX_RECURSIVE) -#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function #else -#define __GTHREAD_RECURSIVE_MUTEX_INIT RECURSIVE_ERRORCHECKMUTEX +#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function #endif #if SUPPORTS_WEAK && GTHREAD_USE_WEAK @@ -531,7 +529,7 @@ __gthread_mutex_unlock (__gthread_mutex_t *mutex) return 0; } -#if !defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP) && defined(PTHREAD_MUTEX_RECURSIVE) +#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP static inline int __gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex) { |