diff options
| author | Eric Botcazou <ebotcazou@libertysurf.fr> | 2004-11-04 11:46:02 +0100 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2004-11-04 10:46:02 +0000 |
| commit | ab3d104990ee26227e9e1ef69064236138745a09 (patch) | |
| tree | 2a81955502f643d338d407b7f6c6cee3331366a8 /gcc/gthr-posix.h | |
| parent | b9af00163ae1e65ac1b829541ee724719cb89cd1 (diff) | |
| download | gcc-ab3d104990ee26227e9e1ef69064236138745a09.zip gcc-ab3d104990ee26227e9e1ef69064236138745a09.tar.gz gcc-ab3d104990ee26227e9e1ef69064236138745a09.tar.bz2 | |
re PR other/18277 (libsupc++/guard.cc:62: error: 'RECURSIVE_ERRORCHECKMUTEX' was not declared in this scope)
PR other/18277
* gthr-posix.h (__gthread_recursive_mutex_init_function): Revert
2004-10-29 patch
From-SVN: r90057
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 a46c653..7cab614 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) { |