summaryrefslogtreecommitdiff
path: root/sysdeps/mach/bits
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2009-01-10 13:22:27 +0000
committerThomas Schwinge <tschwinge@gnu.org>2009-04-08 00:20:33 +0200
commitfa0f7d1afb65bf077edfcc0f8977f95fca5656b9 (patch)
tree7b4b6a8eebcd5557239e763a06190836308ba613 /sysdeps/mach/bits
parent0cdc7a47609ad58922221e490b09cdba599e2b25 (diff)
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.
Diffstat (limited to 'sysdeps/mach/bits')
-rw-r--r--sysdeps/mach/bits/spin-lock-inline.h4
-rw-r--r--sysdeps/mach/bits/spin-lock.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/sysdeps/mach/bits/spin-lock-inline.h b/sysdeps/mach/bits/spin-lock-inline.h
index bb066d0b..f9f7c299 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 54425cc6..537dac9d 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