2009-01-10 Samuel Thibault <samuel.thibault@ens-lyon.org>

	* sysdeps/i386/bits/spin-lock.h (__SPIN_LOCK_INITIALIZER): Rename
	macro to...
	(__PTHREAD_SPIN_LOCK_INITIALIZER): ... this.
	* sysdeps/mach/bits/spin-lock.h (__SPIN_LOCK_INITIALIZER): Rename
	macro to...
	(__PTHREAD_SPIN_LOCK_INITIALIZER): ... this.

	* include/pthread/pthread.h (PTHREAD_SPINLOCK_INITIALIZER): Use
	__PTHREAD_SPIN_LOCK_INITIALIZER instead of
	__SPIN_LOCK_INITIALIZER.
	* sysdeps/generic/bits/condition.h (__PTHREAD_COND_INITIALIZER):
	Likewise.
	* sysdeps/generic/bits/mutex.h (__PTHREAD_MUTEX_INITIALIZER,
	__PTHREAD_RECURSIVE_MUTEX_INITIALIZER):
	Likewise.
	* sysdeps/generic/bits/once.h (__PTHREAD_ONCE_INIT): Likewise.
	* sysdeps/generic/bits/rwlock.h (__PTHREAD_RWLOCK_INITIALIZER):
	Likewise.
	* sysdeps/generic/bits/semaphore.h (__SEMAPHORE_INITIALIZER):
	Likewise.
	* sysdeps/i386/bits/spin-lock-inline.h (__pthread_spin_init):
	Likewise.
	* sysdeps/i386/mach/spin-lock-inline.h (__pthread_spin_init):
	Likewise.

5 files changed, 11 insertions, 11 deletions

diff --git a/sysdeps/generic/bits/condition.h b/sysdeps/generic/bits/condition.h
index f3b09be4..bf13adab 100644
--- a/sysdeps/generic/bits/condition.h
+++ b/sysdeps/generic/bits/condition.h
@@ -1,5 +1,5 @@
 /* Condition type.  Generic version.
-   Copyright (C) 2000, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2005, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -34,6 +34,6 @@ struct __pthread_cond
 
 /* Initializer for a condition variable.  */
 #define __PTHREAD_COND_INITIALIZER \
-  { __SPIN_LOCK_INITIALIZER, NULL, NULL, NULL, NULL }
+  { __PTHREAD_SPIN_LOCK_INITIALIZER, NULL, NULL, NULL, NULL }
 
 #endif /* bits/condition.h */
diff --git a/sysdeps/generic/bits/mutex.h b/sysdeps/generic/bits/mutex.h
index 15a83f49..86068cf5 100644
--- a/sysdeps/generic/bits/mutex.h
+++ b/sysdeps/generic/bits/mutex.h
@@ -1,6 +1,6 @@
 /* Mutex type.  Generic version.
 
-   Copyright (C) 2000, 2002, 2005, 2006, 2007, 2008
+   Copyright (C) 2000, 2002, 2005, 2006, 2007, 2008, 2009
      Free Software Foundation, Inc.
 
    This file is part of the GNU C Library.
@@ -55,10 +55,10 @@ struct __pthread_mutex
 /* Initializer for a mutex.  N.B.  this also happens to be compatible
    with the cthread mutex initializer.  */
 #  define __PTHREAD_MUTEX_INITIALIZER \
-    { __SPIN_LOCK_INITIALIZER, __SPIN_LOCK_INITIALIZER, 0, 0, 0, 0, 0, 0 }
+    { __PTHREAD_SPIN_LOCK_INITIALIZER, __PTHREAD_SPIN_LOCK_INITIALIZER, 0, 0, 0, 0, 0, 0 }
 
 #  define __PTHREAD_RECURSIVE_MUTEX_INITIALIZER \
-    { __SPIN_LOCK_INITIALIZER, __SPIN_LOCK_INITIALIZER, 0, 0,	\
+    { __PTHREAD_SPIN_LOCK_INITIALIZER, __PTHREAD_SPIN_LOCK_INITIALIZER, 0, 0,	\
 	(struct __pthread_mutexattr *) &__pthread_recursive_mutexattr, 0, 0, 0 }
 
 # endif
diff --git a/sysdeps/generic/bits/once.h b/sysdeps/generic/bits/once.h
index 7f572faf..f4985d6f 100644
--- a/sysdeps/generic/bits/once.h
+++ b/sysdeps/generic/bits/once.h
@@ -1,5 +1,5 @@
 /* Dynamic package initialization data structures.  Generic version.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -29,6 +29,6 @@ struct __pthread_once
 };
 
 #define __PTHREAD_ONCE_INIT \
-	{ 0, __SPIN_LOCK_INITIALIZER }
+	{ 0, __PTHREAD_SPIN_LOCK_INITIALIZER }
 
 #endif /* bits/once.h */
diff --git a/sysdeps/generic/bits/rwlock.h b/sysdeps/generic/bits/rwlock.h
index 3d600ec3..af6b1c86 100644
--- a/sysdeps/generic/bits/rwlock.h
+++ b/sysdeps/generic/bits/rwlock.h
@@ -1,5 +1,5 @@
 /* rwlock type.  Generic version.
-   Copyright (C) 2002, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -40,7 +40,7 @@ struct __pthread_rwlock
 
 /* Initializer for a rwlock.  */
 #define __PTHREAD_RWLOCK_INITIALIZER \
-    { __SPIN_LOCK_INITIALIZER, __SPIN_LOCK_INITIALIZER, 0, 0, 0, 0, 0 }
+    { __PTHREAD_SPIN_LOCK_INITIALIZER, __PTHREAD_SPIN_LOCK_INITIALIZER, 0, 0, 0, 0, 0 }
 
 
 #endif /* bits/rwlock.h */
diff --git a/sysdeps/generic/bits/semaphore.h b/sysdeps/generic/bits/semaphore.h
index b53f47e3..5e987c15 100644
--- a/sysdeps/generic/bits/semaphore.h
+++ b/sysdeps/generic/bits/semaphore.h
@@ -1,5 +1,5 @@
 /* Semaphore type.  Generic version.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -38,6 +38,6 @@ struct __semaphore
 
 /* Initializer for a semaphore.  */
 #define __SEMAPHORE_INITIALIZER(pshared, value) \
-  { __SPIN_LOCK_INITIALIZER, NULL, (pshared), (value), NULL }
+  { __PTHREAD_SPIN_LOCK_INITIALIZER, NULL, (pshared), (value), NULL }
 
 #endif /* bits/mutex.h */