libpthread/

2005-01-12  Pietro Ferrari  <pietro@bastardi.net>

	* include/pthread/pthread.h (pthread_spin_destroy): Replace extern
	inline with extern __inline.
	(pthread_spin_init): Likewise.
	(pthread_spin_lock): Likewise.
	(pthread_spin_trylock): Likewise.
	(pthread_spin_unlock): Likewise.
	* sysdeps/mach/bits/spin-lock.h (__pthread_spin_lock): Likewise.
	* sysdeps/i386/bits/spin-lock.h (__pthread_spin_lock): Likewise.
	* sysdeps/generic/bits/mutex.h (__pthread_mutex_trylock):
	Likewise.
	(pthread_mutex_lock): Likewise.
	(pthread_mutex_trylock): Likewise.
	* sysdeps/generic/bits/pthread.h (pthread_equal): Likewise.

6 files changed, 29 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 2ff95f6..9ea8869 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2005-01-12  Pietro Ferrari  <pietro@bastardi.net>
+
+	* include/pthread/pthread.h (pthread_spin_destroy): Replace extern
+	inline with extern __inline.
+	(pthread_spin_init): Likewise.
+	(pthread_spin_lock): Likewise.
+	(pthread_spin_trylock): Likewise.
+	(pthread_spin_unlock): Likewise.
+	* sysdeps/mach/bits/spin-lock.h (__pthread_spin_lock): Likewise.
+	* sysdeps/i386/bits/spin-lock.h (__pthread_spin_lock): Likewise.
+	* sysdeps/generic/bits/mutex.h (__pthread_mutex_trylock):
+	Likewise.
+	(pthread_mutex_lock): Likewise.
+	(pthread_mutex_trylock): Likewise.
+	* sysdeps/generic/bits/pthread.h (pthread_equal): Likewise.
+
 2003-08-17  Marcus Brinkmann  <marcus@gnu.org>
 
 	* sysdeps/hurd/pt-key.h (PTHREAD_KEY_MEMBERS): Change type of
diff --git a/include/pthread/pthread.h b/include/pthread/pthread.h
index cf23d07..8b25811 100644
--- a/include/pthread/pthread.h
+++ b/include/pthread/pthread.h
@@ -420,31 +420,31 @@ extern int pthread_spin_unlock (pthread_spinlock_t *__lock);
 
 # ifdef __USE_EXTERN_INLINES
 
-extern inline int
+extern __inline int
 pthread_spin_destroy (pthread_spinlock_t *__lock)
 {
   return __pthread_spin_destroy (__lock);
 }
 
-extern inline int
+extern __inline int
 pthread_spin_init (pthread_spinlock_t *__lock, int __pshared)
 {
   return __pthread_spin_init (__lock, __pshared);
 }
 
-extern inline int
+extern __inline int
 pthread_spin_lock (pthread_spinlock_t *__lock)
 {
   return __pthread_spin_lock (__lock);
 }
 
-extern inline int
+extern __inline int
 pthread_spin_trylock (pthread_spinlock_t *__lock)
 {
   return __pthread_spin_trylock (__lock);
 }
 
-extern inline int
+extern __inline int
 pthread_spin_unlock (pthread_spinlock_t *__lock)
 {
   return __pthread_spin_unlock (__lock);
diff --git a/sysdeps/generic/bits/mutex.h b/sysdeps/generic/bits/mutex.h
index 2baf040..9958b8d 100644
--- a/sysdeps/generic/bits/mutex.h
+++ b/sysdeps/generic/bits/mutex.h
@@ -108,7 +108,7 @@ __pthread_mutex_lock (struct __pthread_mutex *__mutex)
   return _pthread_mutex_lock (__mutex);
 }
 
-extern inline int
+extern __inline int
 __pthread_mutex_trylock (struct __pthread_mutex *__mutex)
 {
   extern int _pthread_mutex_trylock (struct __pthread_mutex *);
@@ -120,13 +120,13 @@ __pthread_mutex_trylock (struct __pthread_mutex *__mutex)
   return _pthread_mutex_trylock (__mutex);
 }
 
-extern inline int
+extern __inline int
 pthread_mutex_lock (struct __pthread_mutex *__mutex)
 {
   return __pthread_mutex_lock (__mutex);
 }
 
-extern inline int
+extern __inline int
 pthread_mutex_trylock (struct __pthread_mutex *__mutex)
 {
   return __pthread_mutex_trylock (__mutex);
diff --git a/sysdeps/generic/bits/pthread.h b/sysdeps/generic/bits/pthread.h
index 740325d..3f9df13 100644
--- a/sysdeps/generic/bits/pthread.h
+++ b/sysdeps/generic/bits/pthread.h
@@ -24,7 +24,7 @@ typedef int pthread_t;
 
 /* Return true if __T1 and __T2 both name the same thread.  Otherwise,
    false.  */
-extern inline int
+extern __inline int
 pthread_equal (pthread_t __t1, pthread_t __t2)
 {
   return __t1 == __t2;
diff --git a/sysdeps/i386/bits/spin-lock.h b/sysdeps/i386/bits/spin-lock.h
index 175656e..3176a15 100644
--- a/sysdeps/i386/bits/spin-lock.h
+++ b/sysdeps/i386/bits/spin-lock.h
@@ -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 f295df7..e137c24 100644
--- a/sysdeps/mach/bits/spin-lock.h
+++ b/sysdeps/mach/bits/spin-lock.h
@@ -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))