diff options
| author | Richard Guenther <rguenther@suse.de> | 2012-03-13 09:33:43 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2012-03-13 09:33:43 +0000 |
| commit | 074a385f07b39c2d06ccc82badd5708eb6bd9a22 (patch) | |
| tree | 1cdcb2276b46dec2319ff6602e8d876a56fb5aa1 /libgcc | |
| parent | 6c2f0f83a5c02bf30aebbba56d78687023ab0ea0 (diff) | |
| download | gcc-074a385f07b39c2d06ccc82badd5708eb6bd9a22.zip gcc-074a385f07b39c2d06ccc82badd5708eb6bd9a22.tar.gz gcc-074a385f07b39c2d06ccc82badd5708eb6bd9a22.tar.bz2 | |
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
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 5 | ||||
| -rw-r--r-- | libgcc/gthr-posix.h | 11 |
2 files changed, 5 insertions, 11 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 9e44462..7dd7076 100644 --- 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 67d79ff..b5b1611 100644 --- 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) |