diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2008-01-01 04:07:14 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2008-01-01 04:07:14 +0000 |
| commit | 5f60c7ab2316b9b4c61294b754a08e4cb1a9c4e6 (patch) | |
| tree | 1f887e11f8916aef00cebe5396fef48af60a1e6c | |
| parent | 8caaa8379e5a1500863792514189d6e8f414dcaf (diff) | |
2008-01-01 Samuel Thibault <samuel.thibault@ens-lyon.org
* include/pthread/pthread.h (pthread_spin_destroy, pthread_spin_init,
pthread_spin_lock, pthread_spin_trylock, pthread_spin_unlock): Use
__extern_inline macro instead of extern __inline.
* sysdeps/i386/bits/spin-lock.h (__PT_SPIN_INLINE,
__pthread_spin_lock): Likewise
* sysdeps/mach/bits/spin-lock.h (__PT_SPIN_INLINE,
__pthread_spin_lock): Likewise
* sysdeps/generic/bits/pthread.h (pthread_equal): Declare ; only
provide inline when __USE_EXTERN_INLINES is defined. Use __extern_inline
macro instead of extern __inline.
* sysdeps/i386/bits/memory.h (__memory_barrier): Add static to inline.
| -rw-r--r-- | sysdeps/generic/bits/pthread.h | 7 | ||||
| -rw-r--r-- | sysdeps/i386/bits/memory.h | 2 | ||||
| -rw-r--r-- | sysdeps/i386/bits/spin-lock.h | 6 | ||||
| -rw-r--r-- | sysdeps/mach/bits/spin-lock.h | 6 |
4 files changed, 13 insertions, 8 deletions
diff --git a/sysdeps/generic/bits/pthread.h b/sysdeps/generic/bits/pthread.h index 3f9df13d..5e239d67 100644 --- a/sysdeps/generic/bits/pthread.h +++ b/sysdeps/generic/bits/pthread.h @@ -24,10 +24,15 @@ typedef int pthread_t; /* Return true if __T1 and __T2 both name the same thread. Otherwise, false. */ -extern __inline int +extern int +pthread_equal (pthread_t __t1, pthread_t __t2); + +#ifdef __USE_EXTERN_INLINES +__extern_inline int pthread_equal (pthread_t __t1, pthread_t __t2) { return __t1 == __t2; } +#endif #endif /* bits/pthread.h */ diff --git a/sysdeps/i386/bits/memory.h b/sysdeps/i386/bits/memory.h index 201305b9..57c1463c 100644 --- a/sysdeps/i386/bits/memory.h +++ b/sysdeps/i386/bits/memory.h @@ -21,7 +21,7 @@ #define _BITS_MEMORY_H 1 /* Prevent read and write reordering across this function. */ -inline void +static inline void __memory_barrier (void) { int i; diff --git a/sysdeps/i386/bits/spin-lock.h b/sysdeps/i386/bits/spin-lock.h index e86bc13e..d893654d 100644 --- a/sysdeps/i386/bits/spin-lock.h +++ b/sysdeps/i386/bits/spin-lock.h @@ -42,7 +42,7 @@ typedef __volatile int __pthread_spinlock_t; # endif # ifndef __PT_SPIN_INLINE -# define __PT_SPIN_INLINE extern __inline +# define __PT_SPIN_INLINE __extern_inline # endif __PT_SPIN_INLINE int __pthread_spin_destroy (__pthread_spinlock_t *__lock); @@ -74,10 +74,10 @@ __pthread_spin_trylock (__pthread_spinlock_t *__lock) return __locked ? __EBUSY : 0; } -extern __inline int __pthread_spin_lock (__pthread_spinlock_t *__lock); +__extern_inline int __pthread_spin_lock (__pthread_spinlock_t *__lock); extern int _pthread_spin_lock (__pthread_spinlock_t *__lock); -extern __inline int +__extern_inline int __pthread_spin_lock (__pthread_spinlock_t *__lock) { if (__pthread_spin_trylock (__lock)) diff --git a/sysdeps/mach/bits/spin-lock.h b/sysdeps/mach/bits/spin-lock.h index e137c244..031e9cec 100644 --- a/sysdeps/mach/bits/spin-lock.h +++ b/sysdeps/mach/bits/spin-lock.h @@ -41,7 +41,7 @@ typedef __spin_lock_t __pthread_spinlock_t; # endif # ifndef __PT_SPIN_INLINE -# define __PT_SPIN_INLINE extern __inline +# define __PT_SPIN_INLINE __extern_inline # endif __PT_SPIN_INLINE int __pthread_spin_destroy (__pthread_spinlock_t *__lock); @@ -70,10 +70,10 @@ __pthread_spin_trylock (__pthread_spinlock_t *__lock) return __spin_try_lock (__lock) ? 0 : __EBUSY; } -extern __inline int __pthread_spin_lock (__pthread_spinlock_t *__lock); +__extern_inline int __pthread_spin_lock (__pthread_spinlock_t *__lock); extern int _pthread_spin_lock (__pthread_spinlock_t *__lock); -extern __inline int +__extern_inline int __pthread_spin_lock (__pthread_spinlock_t *__lock) { if (__pthread_spin_trylock (__lock)) |