re PR other/18277 (libsupc++/guard.cc:62: error: 'RECURSIVE_ERRORCHECKMUTEX' was...

	PR other/18277
	* gthr-posix.h (__gthread_recursive_mutex_init_function): Revert
	2004-10-29 patch

From-SVN: r90057

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7e1c1a1..1c49508 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-04  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+       PR other/18277
+       * gthr-posix.h (__gthread_recursive_mutex_init_function): Revert
+       2004-10-29 patch
+
 2004-11-04  Nathan Sidwell  <nathan@codesourcery.com>
 
        * predict.c (propagate_freq): Make bitno unsigned. Move

diff --git a/gcc/gthr-posix.h b/gcc/gthr-posix.h
index a46c653..7cab614 100644 (file)
--- 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)
 {