summaryrefslogtreecommitdiff
path: root/debian/patches/libpthread_inline.patch
blob: a2c62e22b950f4f37b9346180f8e81e2979f81fa (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
Index: libpthread/include/pthread/pthread.h
===================================================================
RCS file: /cvsroot/hurd/hurd/libpthread/include/pthread/pthread.h,v
retrieving revision 1.9
diff -u -p -r1.9 pthread.h
--- libpthread/include/pthread/pthread.h	24 Jun 2007 15:11:52 -0000	1.9
+++ libpthread/include/pthread/pthread.h	3 Sep 2007 22:21:52 -0000
@@ -454,31 +454,31 @@ extern int pthread_spin_unlock (pthread_
 
 # 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: libpthread/sysdeps/generic/bits/pthread.h
===================================================================
RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/bits/pthread.h,v
retrieving revision 1.2
diff -u -p -r1.2 pthread.h
--- libpthread/sysdeps/generic/bits/pthread.h	18 Jan 2005 09:57:35 -0000	1.2
+++ libpthread/sysdeps/generic/bits/pthread.h	3 Sep 2007 22:21:52 -0000
@@ -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 */
Index: libpthread/sysdeps/i386/bits/memory.h
===================================================================
RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/i386/bits/memory.h,v
retrieving revision 1.1
diff -u -p -r1.1 memory.h
--- libpthread/sysdeps/i386/bits/memory.h	10 Oct 2002 23:05:05 -0000	1.1
+++ libpthread/sysdeps/i386/bits/memory.h	3 Sep 2007 22:21:52 -0000
@@ -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;
Index: libpthread/sysdeps/i386/bits/spin-lock.h
===================================================================
RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/i386/bits/spin-lock.h,v
retrieving revision 1.3
diff -u -p -r1.3 spin-lock.h
--- libpthread/sysdeps/i386/bits/spin-lock.h	12 May 2005 20:55:37 -0000	1.3
+++ libpthread/sysdeps/i386/bits/spin-lock.h	3 Sep 2007 22:21:52 -0000
@@ -42,7 +42,7 @@ typedef __volatile int __pthread_spinloc
 # 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_spinlo
   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: libpthread/sysdeps/mach/bits/spin-lock.h
===================================================================
RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/mach/bits/spin-lock.h,v
retrieving revision 1.2
diff -u -p -r1.2 spin-lock.h
--- libpthread/sysdeps/mach/bits/spin-lock.h	18 Jan 2005 09:57:34 -0000	1.2
+++ libpthread/sysdeps/mach/bits/spin-lock.h	3 Sep 2007 22:21:52 -0000
@@ -41,7 +41,7 @@ typedef __spin_lock_t __pthread_spinlock
 # 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_spinlo
   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))