gthr-posix.h: Remove duplicate __GTHREAD_MUTEX_INIT_FUNCTION and...

2012-03-13  Richard Guenther  <rguenther@suse.de>

	* gthr-posix.h: Remove duplicate __GTHREAD_MUTEX_INIT_FUNCTION
	and __gthread_mutex_init_function definitions.

From-SVN: r185320

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 9e4446279c813ff2eccf24711073b6a58d2c7833..7dd7076a34b5d9f49b15432de65bef0fea832605 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-13  Richard Guenther  <rguenther@suse.de>
+
+       * gthr-posix.h: Remove duplicate __GTHREAD_MUTEX_INIT_FUNCTION
+       and __gthread_mutex_init_function definitions.
+
 2012-03-12  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * config.host (mips*-*-openbsd*): Remove.

diff --git a/libgcc/gthr-posix.h b/libgcc/gthr-posix.h
index 67d79ff3e7c293086137d82787dc94c89b166809..b5b161184f45c24e702dd74178faa4da5f5c8c79 100644 (file)
--- a/libgcc/gthr-posix.h
+++ b/libgcc/gthr-posix.h
@@ -72,7 +72,6 @@ typedef struct timespec __gthread_time_t;
 
 #ifdef _GTHREAD_USE_MUTEX_INIT_FUNC
 # undef __GTHREAD_MUTEX_INIT
-# define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function
 #endif
 #ifdef _GTHREAD_USE_RECURSIVE_MUTEX_INIT_FUNC
 # undef __GTHREAD_RECURSIVE_MUTEX_INIT
@@ -702,22 +701,12 @@ __gthread_setspecific (__gthread_key_t __key, const void *__ptr)
   return __gthrw_(pthread_setspecific) (__key, __ptr);
 }
 
-#ifdef _GTHREAD_USE_MUTEX_INIT_FUNC
 static inline void
 __gthread_mutex_init_function (__gthread_mutex_t *__mutex)
 {
   if (__gthread_active_p ())
     __gthrw_(pthread_mutex_init) (__mutex, NULL);
 }
-#endif
-
-static inline int
-__gthread_mutex_init_function (__gthread_mutex_t *__mutex)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(pthread_mutex_init) (__mutex, NULL);
-  return 0;
-}
 
 static inline int
 __gthread_mutex_destroy (__gthread_mutex_t *__mutex)