From 5f60c7ab2316b9b4c61294b754a08e4cb1a9c4e6 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue, 1 Jan 2008 04:07:14 +0000
Subject: 2008-01-01  Samuel Thibault  <samuel.thibault@ens-lyon.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* 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.
---
 sysdeps/mach/bits/spin-lock.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sysdeps/mach/bits')

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))
-- 
cgit v1.2.3