summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog27
-rw-r--r--include/pthread/pthread.h4
-rw-r--r--sysdeps/generic/bits/condition.h4
-rw-r--r--sysdeps/generic/bits/mutex.h6
-rw-r--r--sysdeps/generic/bits/once.h4
-rw-r--r--sysdeps/generic/bits/rwlock.h4
-rw-r--r--sysdeps/generic/bits/semaphore.h4
-rw-r--r--sysdeps/ia32/bits/spin-lock-inline.h4
-rw-r--r--sysdeps/ia32/bits/spin-lock.h4
-rw-r--r--sysdeps/mach/bits/spin-lock-inline.h4
-rw-r--r--sysdeps/mach/bits/spin-lock.h6
11 files changed, 49 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index faf5ec1..2dcc177 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+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.
+
2008-12-21 Samuel Thibault <samuel.thibault@ens-lyon.org>
* sysdeps/mach/pt-timedblock.c (__pthread_timedblock): Fix timeout
diff --git a/include/pthread/pthread.h b/include/pthread/pthread.h
index c821d57..dedb09d 100644
--- a/include/pthread/pthread.h
+++ b/include/pthread/pthread.h
@@ -1,4 +1,4 @@
-/* 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.
@@ -433,7 +433,7 @@ extern int pthread_cond_timedwait (pthread_cond_t *__restrict __cond,
# include <bits/spin-lock.h>
-#define PTHREAD_SPINLOCK_INITIALIZER __SPIN_LOCK_INITIALIZER
+#define PTHREAD_SPINLOCK_INITIALIZER __PTHREAD_SPIN_LOCK_INITIALIZER
/* Destroy the spin lock object LOCK. */
extern int pthread_spin_destroy (pthread_spinlock_t *__lock);
diff --git a/sysdeps/generic/bits/condition.h b/sysdeps/generic/bits/condition.h
index f3b09be..bf13ada 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 15a83f4..86068cf 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 7f572fa..f4985d6 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 3d600ec..af6b1c8 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 b53f47e..5e987c1 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 */
diff --git a/sysdeps/ia32/bits/spin-lock-inline.h b/sysdeps/ia32/bits/spin-lock-inline.h
index 0f3ca58..e5ed3de 100644
--- a/sysdeps/ia32/bits/spin-lock-inline.h
+++ b/sysdeps/ia32/bits/spin-lock-inline.h
@@ -1,5 +1,5 @@
/* Machine-specific definitions for spin locks. i386 version.
- Copyright (C) 2000, 2005, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2005, 2008, 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
@@ -54,7 +54,7 @@ __PT_SPIN_INLINE int __pthread_spin_init (__pthread_spinlock_t *__lock,
__PT_SPIN_INLINE int
__pthread_spin_init (__pthread_spinlock_t *__lock, int __pshared)
{
- *__lock = __SPIN_LOCK_INITIALIZER;
+ *__lock = __PTHREAD_SPIN_LOCK_INITIALIZER;
return 0;
}
diff --git a/sysdeps/ia32/bits/spin-lock.h b/sysdeps/ia32/bits/spin-lock.h
index 71af163..5ae81e1 100644
--- a/sysdeps/ia32/bits/spin-lock.h
+++ b/sysdeps/ia32/bits/spin-lock.h
@@ -1,5 +1,5 @@
/* Machine-specific definitions for spin locks. i386 version.
- Copyright (C) 2000, 2005, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2005, 2008, 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
@@ -32,7 +32,7 @@ __BEGIN_DECLS
typedef __volatile int __pthread_spinlock_t;
/* Initializer for a spin lock object. */
-# define __SPIN_LOCK_INITIALIZER ((__pthread_spinlock_t) 0)
+# define __PTHREAD_SPIN_LOCK_INITIALIZER ((__pthread_spinlock_t) 0)
__END_DECLS
diff --git a/sysdeps/mach/bits/spin-lock-inline.h b/sysdeps/mach/bits/spin-lock-inline.h
index bb066d0..f9f7c29 100644
--- a/sysdeps/mach/bits/spin-lock-inline.h
+++ b/sysdeps/mach/bits/spin-lock-inline.h
@@ -1,5 +1,5 @@
/* Definitions of user-visible names for spin locks.
- Copyright (C) 1994, 1997, 2002, 2008 Free Software Foundation, Inc.
+ Copyright (C) 1994, 1997, 2002, 2008, 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
@@ -51,7 +51,7 @@ __PT_SPIN_INLINE int __pthread_spin_init (__pthread_spinlock_t *__lock,
__PT_SPIN_INLINE int
__pthread_spin_init (__pthread_spinlock_t *__lock, int __pshared)
{
- *__lock = __SPIN_LOCK_INITIALIZER;
+ *__lock = __PTHREAD_SPIN_LOCK_INITIALIZER;
return 0;
}
diff --git a/sysdeps/mach/bits/spin-lock.h b/sysdeps/mach/bits/spin-lock.h
index 54425cc..537dac9 100644
--- a/sysdeps/mach/bits/spin-lock.h
+++ b/sysdeps/mach/bits/spin-lock.h
@@ -1,5 +1,5 @@
/* Definitions of user-visible names for spin locks.
- Copyright (C) 1994, 1997, 2002, 2008 Free Software Foundation, Inc.
+ Copyright (C) 1994, 1997, 2002, 2008, 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,8 +29,8 @@ __BEGIN_DECLS
typedef __spin_lock_t __pthread_spinlock_t;
/* Initializer for a spin lock object. */
-#ifndef __SPIN_LOCK_INITIALIZER
-#error __SPIN_LOCK_INITIALIZER undefined: should be defined by <lock-intern.h>.
+#ifndef __PTHREAD_SPIN_LOCK_INITIALIZER
+#error __PTHREAD_SPIN_LOCK_INITIALIZER undefined: should be defined by <lock-intern.h>.
#endif
__END_DECLS
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-31 10:56:41 +0000