diff options
| -rw-r--r-- | linuxthreads/ChangeLog | 6 | ||||
| -rw-r--r-- | linuxthreads/oldsemaphore.c | 2 | ||||
| -rw-r--r-- | linuxthreads/spinlock.c | 8 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/pthread/bits/libc-lock.h | 4 |
4 files changed, 13 insertions, 7 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index c4cacf29e1..b28b706298 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,9 @@ +2001-01-28 Andreas Jaeger <aj@suse.de> + + * oldsemaphore.c (__old_sem_init): Adjust for last change. + * sysdeps/pthread/bits/libc-lock.h: Likewise. + * spinlock.c: Likewise. + 2001-01-28 Ulrich Drepper <drepper@redhat.com> * sysdeps/pthread/bits/initspin.h: Make all names namespace clean. diff --git a/linuxthreads/oldsemaphore.c b/linuxthreads/oldsemaphore.c index 82cd63797f..da5272cd24 100644 --- a/linuxthreads/oldsemaphore.c +++ b/linuxthreads/oldsemaphore.c @@ -73,7 +73,7 @@ int __old_sem_init(old_sem_t *sem, int pshared, unsigned int value) errno = ENOSYS; return -1; } - sem->sem_spinlock = LT_SPINLOCK_INIT; + sem->sem_spinlock = __LT_SPINLOCK_INIT; sem->sem_status = ((long)value << 1) + 1; return 0; } diff --git a/linuxthreads/spinlock.c b/linuxthreads/spinlock.c index 5846c45fec..63f2ed1693 100644 --- a/linuxthreads/spinlock.c +++ b/linuxthreads/spinlock.c @@ -155,7 +155,7 @@ int __pthread_unlock(struct _pthread_fastlock * lock) #if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP { WRITE_MEMORY_BARRIER(); - lock->__spinlock = LT_SPINLOCK_INIT; + lock->__spinlock = __LT_SPINLOCK_INIT; return 0; } #endif @@ -394,7 +394,7 @@ void __pthread_alt_lock(struct _pthread_fastlock * lock, } WRITE_MEMORY_BARRIER(); - lock->__spinlock = LT_SPINLOCK_INIT; + lock->__spinlock = __LT_SPINLOCK_INIT; if (suspend_needed) suspend (self); @@ -468,7 +468,7 @@ int __pthread_alt_timedlock(struct _pthread_fastlock * lock, } WRITE_MEMORY_BARRIER(); - lock->__spinlock = LT_SPINLOCK_INIT; + lock->__spinlock = __LT_SPINLOCK_INIT; goto suspend; } #endif @@ -649,7 +649,7 @@ void __pthread_alt_unlock(struct _pthread_fastlock *lock) #if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP { WRITE_MEMORY_BARRIER(); - lock->__spinlock = LT_SPINLOCK_INIT; + lock->__spinlock = __LT_SPINLOCK_INIT; } #endif } diff --git a/linuxthreads/sysdeps/pthread/bits/libc-lock.h b/linuxthreads/sysdeps/pthread/bits/libc-lock.h index 41bca4de3f..dbd9cc14fd 100644 --- a/linuxthreads/sysdeps/pthread/bits/libc-lock.h +++ b/linuxthreads/sysdeps/pthread/bits/libc-lock.h @@ -1,5 +1,5 @@ /* libc-internal interface for mutex locks. LinuxThreads version. - Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1996,1997,1998,1999,2000,2001 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 @@ -55,7 +55,7 @@ typedef pthread_key_t __libc_key_t; initialized locks must be set to one due to the lack of normal atomic operations.) */ -#if LT_SPINLOCK_INIT == 0 +#if __LT_SPINLOCK_INIT == 0 # define __libc_lock_define_initialized(CLASS,NAME) \ CLASS __libc_lock_t NAME; #else |