Move bits/spin-lock.h to bits/types/__pthread_spinlock_t.h

* sysdeps/mach/bits/spin-lock.h: Move file to...
* sysdeps/mach/bits/types/__pthread_spinlock_t.h: ... here.
* Makefile (headers): Move bits/spin-lock.h to
bits/types/__pthread_spinlock_t.h.
* pthread/pt-spin-inlines.c: Update accordingly.
* sysdeps/generic/pthread.h: Likewise.
* sysdeps/mach/bits/spin-lock-inline.h: Likewise.
* sysdeps/pthread/bits/barrier.h: Likewise.
* sysdeps/pthread/bits/condition.h: Likewise.
* sysdeps/pthread/bits/mutex.h: Likewise.
* sysdeps/pthread/bits/once.h: Likewise.
* sysdeps/pthread/bits/pthreadtypes.h: Likewise.
* sysdeps/pthread/bits/rwlock.h: Likewise.
* sysdeps/pthread/bits/semaphore.h: Likewise.

12 files changed, 15 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index 54aa575..fa33d92 100644
--- a/Makefile
+++ b/Makefile
@@ -151,7 +151,7 @@ headers :=				\
               bits/mutex.h			\
               bits/condition.h			\
               bits/condition-attr.h		\
-              bits/spin-lock.h			\
+              bits/types/__pthread_spinlock_t.h	\
               bits/spin-lock-inline.h		\
               bits/cancelation.h		\
               bits/thread-attr.h		\
diff --git a/pthread/pt-spin-inlines.c b/pthread/pt-spin-inlines.c
index 4c9aa46..40a692b 100644
--- a/pthread/pt-spin-inlines.c
+++ b/pthread/pt-spin-inlines.c
@@ -15,7 +15,7 @@
    License along with the GNU C Library; see the file COPYING.LIB.  If
    not, see <http://www.gnu.org/licenses/>.  */
 
-/* <bits/spin-lock.h> declares some extern inline functions.  These
+/* <bits/types/__pthread_spinlock_t.h> declares some extern inline functions.  These
    functions are declared additionally here for use when inlining is
    not possible.  */
 
diff --git a/sysdeps/generic/pthread.h b/sysdeps/generic/pthread.h
index d2e73c2..cded1ca 100644
--- a/sysdeps/generic/pthread.h
+++ b/sysdeps/generic/pthread.h
@@ -521,7 +521,7 @@ extern int pthread_cond_timedwait (pthread_cond_t *__restrict __cond,
 
 #ifdef __USE_XOPEN2K
 
-# include <bits/spin-lock.h>
+# include <bits/types/__pthread_spinlock_t.h>
 
 #define PTHREAD_SPINLOCK_INITIALIZER __PTHREAD_SPIN_LOCK_INITIALIZER
 
diff --git a/sysdeps/mach/bits/spin-lock-inline.h b/sysdeps/mach/bits/spin-lock-inline.h
index c1c599c..695c6dc 100644
--- a/sysdeps/mach/bits/spin-lock-inline.h
+++ b/sysdeps/mach/bits/spin-lock-inline.h
@@ -20,7 +20,7 @@
 #define _BITS_SPIN_LOCK_INLINE_H	1
 
 #include <features.h>
-#include <bits/spin-lock.h>
+#include <bits/types/__pthread_spinlock_t.h>
 #include <lock-intern.h>   /* This does all the work.  */
 
 __BEGIN_DECLS
@@ -84,4 +84,4 @@ __pthread_spin_unlock (__pthread_spinlock_t *__lock)
 
 __END_DECLS
 
-#endif /* bits/spin-lock.h */
+#endif /* bits/types/__pthread_spinlock_t.h */
diff --git a/sysdeps/mach/bits/spin-lock.h b/sysdeps/mach/bits/types/__pthread_spinlock_t.h
index ef210fc..038e2b4 100644
--- a/sysdeps/mach/bits/spin-lock.h
+++ b/sysdeps/mach/bits/types/__pthread_spinlock_t.h
@@ -16,8 +16,8 @@
    License along with the GNU C Library;  if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef _BITS_SPIN_LOCK_H
-#define _BITS_SPIN_LOCK_H	1
+#ifndef _BITS_TYPES___PTHREAD_SPINLOCK_T_H
+#define _BITS_TYPES___PTHREAD_SPINLOCK_T_H	1
 
 #include <features.h>
 
@@ -31,4 +31,4 @@ typedef volatile int __pthread_spinlock_t;
 
 __END_DECLS
 
-#endif /* bits/spin-lock.h */
+#endif /* bits/types/__pthread_spinlock_t.h */
diff --git a/sysdeps/pthread/bits/barrier.h b/sysdeps/pthread/bits/barrier.h
index 52b35c0..2ea8c15 100644
--- a/sysdeps/pthread/bits/barrier.h
+++ b/sysdeps/pthread/bits/barrier.h
@@ -19,7 +19,7 @@
 #ifndef _BITS_BARRIER_H
 #define _BITS_BARRIER_H	1
 
-#include <bits/spin-lock.h>
+#include <bits/types/__pthread_spinlock_t.h>
 
 /* This structure describes the attributes of a POSIX barrier.  */
 struct __pthread_barrier
diff --git a/sysdeps/pthread/bits/condition.h b/sysdeps/pthread/bits/condition.h
index 7e59ae6..75942e2 100644
--- a/sysdeps/pthread/bits/condition.h
+++ b/sysdeps/pthread/bits/condition.h
@@ -19,7 +19,7 @@
 #ifndef _BITS_CONDITION_H
 #define _BITS_CONDITION_H	1
 
-#include <bits/spin-lock.h>
+#include <bits/types/__pthread_spinlock_t.h>
 
 /* User visible part of a condition variable.  */
 struct __pthread_cond
diff --git a/sysdeps/pthread/bits/mutex.h b/sysdeps/pthread/bits/mutex.h
index 0a88348..bd1ad8f 100644
--- a/sysdeps/pthread/bits/mutex.h
+++ b/sysdeps/pthread/bits/mutex.h
@@ -21,7 +21,7 @@
 #ifndef _BITS_MUTEX_H
 #define _BITS_MUTEX_H	1
 
-#include <bits/spin-lock.h>
+#include <bits/types/__pthread_spinlock_t.h>
 #include <bits/mutex-attr.h>
 
 /* User visible part of a mutex.  */
diff --git a/sysdeps/pthread/bits/once.h b/sysdeps/pthread/bits/once.h
index 4ba68ab..610a269 100644
--- a/sysdeps/pthread/bits/once.h
+++ b/sysdeps/pthread/bits/once.h
@@ -19,7 +19,7 @@
 #ifndef _BITS_ONCE_H
 #define _BITS_ONCE_H	1
 
-#include <bits/spin-lock.h>
+#include <bits/types/__pthread_spinlock_t.h>
 
 struct __pthread_once
 {
diff --git a/sysdeps/pthread/bits/pthreadtypes.h b/sysdeps/pthread/bits/pthreadtypes.h
index 8853e1e..574ec63 100644
--- a/sysdeps/pthread/bits/pthreadtypes.h
+++ b/sysdeps/pthread/bits/pthreadtypes.h
@@ -98,7 +98,7 @@ typedef struct __pthread_condattr pthread_condattr_t;
 typedef struct __pthread_cond pthread_cond_t;
 
 #ifdef __USE_XOPEN2K
-# include <bits/spin-lock.h>
+# include <bits/types/__pthread_spinlock_t.h>
 typedef __pthread_spinlock_t pthread_spinlock_t;
 #endif /* XPG6.  */
 
diff --git a/sysdeps/pthread/bits/rwlock.h b/sysdeps/pthread/bits/rwlock.h
index df18503..8fee357 100644
--- a/sysdeps/pthread/bits/rwlock.h
+++ b/sysdeps/pthread/bits/rwlock.h
@@ -19,7 +19,7 @@
 #ifndef _BITS_RWLOCK_H
 #define _BITS_RWLOCK_H
 
-#include <bits/spin-lock.h>
+#include <bits/types/__pthread_spinlock_t.h>
 
 /* User visible part of a rwlock.  If __held is not held and readers
    is 0, then the lock is unlocked.  If __held is held and readers is
diff --git a/sysdeps/pthread/bits/semaphore.h b/sysdeps/pthread/bits/semaphore.h
index 1b20f75..6913766 100644
--- a/sysdeps/pthread/bits/semaphore.h
+++ b/sysdeps/pthread/bits/semaphore.h
@@ -23,7 +23,7 @@
 #error Never include <bits/semaphore.h> directly.
 #endif
 
-#include <bits/spin-lock.h>
+#include <bits/types/__pthread_spinlock_t.h>
 #include <bits/pthread.h>
 
 /* User visible part of a semaphore.  */