this patch does s/inline/__inline__ for all pthread headers that get
installed.
2005-01-12 Pietro Ferrari <[EMAIL PROTECTED]>
* include/pthread/pthread.h (pthread_spin_destroy): Change
return type from extern inline to 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): Change
return type from extern inline to extern __inline__.
* sysdeps/i386/bits/spin-lock.h (__pthread_spin_lock): Change
return type from extern inline to extern __inline__.
* sysdeps/generic/bits/mutex.h (__pthread_mutex_trylock):
Change return type from extern inline to extern __inline__.
(pthread_mutex_lock): Likewise.
* sysdeps/generic/bits/pthread.h (pthread_equal): Change
return type from extern inline to extern __inline__.
--
"Educators, generals, dieticians, psychologists, and parents program.
Armies, students, and some societies are programmed."
--Harold Abelson and Gerald Jay Sussman with Julie Sussman, "Structure
and Interpretation of Computer Programs"Index: include/pthread/pthread.h
===================================================================
RCS file: /cvsroot/hurd/hurd/libpthread/include/pthread/pthread.h,v
retrieving revision 1.2
diff -u -r1.2 pthread.h
--- include/pthread/pthread.h 10 Nov 2002 04:18:11 -0000 1.2
+++ include/pthread/pthread.h 12 Jan 2005 18:15:38 -0000
@@ -420,31 +420,31 @@
# 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);
Index: sysdeps/generic/bits/mutex.h
===================================================================
RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/bits/mutex.h,v
retrieving revision 1.1
diff -u -r1.1 mutex.h
--- sysdeps/generic/bits/mutex.h 10 Oct 2002 23:05:05 -0000 1.1
+++ sysdeps/generic/bits/mutex.h 12 Jan 2005 18:15:38 -0000
@@ -108,7 +108,7 @@
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 @@
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);
Index: sysdeps/generic/bits/pthread.h
===================================================================
RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/bits/pthread.h,v
retrieving revision 1.1
diff -u -r1.1 pthread.h
--- sysdeps/generic/bits/pthread.h 10 Oct 2002 23:05:05 -0000 1.1
+++ sysdeps/generic/bits/pthread.h 12 Jan 2005 18:15:38 -0000
@@ -24,7 +24,7 @@
/* 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;
Index: sysdeps/i386/bits/spin-lock.h
===================================================================
RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/i386/bits/spin-lock.h,v
retrieving revision 1.1
diff -u -r1.1 spin-lock.h
--- sysdeps/i386/bits/spin-lock.h 10 Oct 2002 23:05:05 -0000 1.1
+++ sysdeps/i386/bits/spin-lock.h 12 Jan 2005 18:15:38 -0000
@@ -74,10 +74,10 @@
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))
Index: sysdeps/mach/bits/spin-lock.h
===================================================================
RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/mach/bits/spin-lock.h,v
retrieving revision 1.1
diff -u -r1.1 spin-lock.h
--- sysdeps/mach/bits/spin-lock.h 10 Oct 2002 23:05:05 -0000 1.1
+++ sysdeps/mach/bits/spin-lock.h 12 Jan 2005 18:15:38 -0000
@@ -70,10 +70,10 @@
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))_______________________________________________
Bug-hurd mailing list
Bug-hurd@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-hurd
