diff options
Diffstat (limited to 'sysdeps/nptl')
| -rw-r--r-- | sysdeps/nptl/bits/libc-lock.h | 14 | ||||
| -rw-r--r-- | sysdeps/nptl/bits/libc-lockP.h | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sysdeps/nptl/bits/libc-lock.h b/sysdeps/nptl/bits/libc-lock.h index 66e5b93443..2acc6bfcd0 100644 --- a/sysdeps/nptl/bits/libc-lock.h +++ b/sysdeps/nptl/bits/libc-lock.h @@ -26,7 +26,7 @@ /* Mutex type. */ #if defined _LIBC || defined _IO_MTSAFE_IO -# if (defined NOT_IN_libc && !defined IS_IN_libpthread) || !defined _LIBC +# if (defined NOT_IN_libc && !IS_IN (libpthread)) || !defined _LIBC typedef struct { pthread_mutex_t mutex; } __libc_lock_recursive_t; # else typedef struct { int lock; int cnt; void *owner; } __libc_lock_recursive_t; @@ -47,7 +47,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; /* Define an initialized recursive lock variable NAME with storage class CLASS. */ -#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread) +#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread)) # define __libc_lock_define_initialized_recursive(CLASS, NAME) \ CLASS __libc_lock_recursive_t NAME = _LIBC_LOCK_RECURSIVE_INITIALIZER; # define _LIBC_LOCK_RECURSIVE_INITIALIZER \ @@ -60,7 +60,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; #endif /* Initialize a recursive mutex. */ -#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread) +#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread)) # define __libc_lock_init_recursive(NAME) \ ((void) ((NAME) = (__libc_lock_recursive_t) _LIBC_LOCK_RECURSIVE_INITIALIZER)) #else @@ -78,7 +78,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; #endif /* Finalize recursive named lock. */ -#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread) +#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread)) # define __libc_lock_fini_recursive(NAME) ((void) 0) #else # define __libc_lock_fini_recursive(NAME) \ @@ -86,7 +86,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; #endif /* Lock the recursive named lock variable. */ -#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread) +#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread)) # define __libc_lock_lock_recursive(NAME) \ do { \ void *self = THREAD_SELF; \ @@ -103,7 +103,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; #endif /* Try to lock the recursive named lock variable. */ -#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread) +#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread)) # define __libc_lock_trylock_recursive(NAME) \ ({ \ int result = 0; \ @@ -128,7 +128,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; #endif /* Unlock the recursive named lock variable. */ -#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread) +#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread)) /* We do no error checking here. */ # define __libc_lock_unlock_recursive(NAME) \ do { \ diff --git a/sysdeps/nptl/bits/libc-lockP.h b/sysdeps/nptl/bits/libc-lockP.h index 5351a51b11..ae17507c99 100644 --- a/sysdeps/nptl/bits/libc-lockP.h +++ b/sysdeps/nptl/bits/libc-lockP.h @@ -35,7 +35,7 @@ #include <pthread-functions.h> /* Mutex type. */ -#if defined NOT_IN_libc && !defined IS_IN_libpthread +#if defined NOT_IN_libc && !IS_IN (libpthread) typedef pthread_mutex_t __libc_lock_t; #else typedef int __libc_lock_t; @@ -69,7 +69,7 @@ typedef pthread_key_t __libc_key_t; initialized locks must be set to one due to the lack of normal atomic operations.) */ -#if !defined NOT_IN_libc || defined IS_IN_libpthread +#if !defined NOT_IN_libc || IS_IN (libpthread) # if LLL_LOCK_INITIALIZER == 0 # define __libc_lock_define_initialized(CLASS,NAME) \ CLASS __libc_lock_t NAME; @@ -125,7 +125,7 @@ typedef pthread_key_t __libc_key_t; /* Initialize the named lock variable, leaving it in a consistent, unlocked state. */ -#if !defined NOT_IN_libc || defined IS_IN_libpthread +#if !defined NOT_IN_libc || IS_IN (libpthread) # define __libc_lock_init(NAME) \ ((void) ((NAME) = LLL_LOCK_INITIALIZER)) #else @@ -144,7 +144,7 @@ typedef pthread_key_t __libc_key_t; /* Finalize the named lock variable, which must be locked. It cannot be used again until __libc_lock_init is called again on it. This must be called on a lock variable before the containing storage is reused. */ -#if !defined NOT_IN_libc || defined IS_IN_libpthread +#if !defined NOT_IN_libc || IS_IN (libpthread) # define __libc_lock_fini(NAME) ((void) 0) #else # define __libc_lock_fini(NAME) \ @@ -158,7 +158,7 @@ typedef pthread_key_t __libc_key_t; #endif /* Lock the named lock variable. */ -#if !defined NOT_IN_libc || defined IS_IN_libpthread +#if !defined NOT_IN_libc || IS_IN (libpthread) # ifndef __libc_lock_lock # define __libc_lock_lock(NAME) \ ({ lll_lock (NAME, LLL_PRIVATE); 0; }) @@ -174,7 +174,7 @@ typedef pthread_key_t __libc_key_t; __libc_ptf_call (__pthread_rwlock_wrlock, (&(NAME)), 0) /* Try to lock the named lock variable. */ -#if !defined NOT_IN_libc || defined IS_IN_libpthread +#if !defined NOT_IN_libc || IS_IN (libpthread) # ifndef __libc_lock_trylock # define __libc_lock_trylock(NAME) \ lll_trylock (NAME) @@ -193,7 +193,7 @@ typedef pthread_key_t __libc_key_t; __libc_maybe_call (__pthread_mutex_trylock, (&(NAME).mutex), 0) /* Unlock the named lock variable. */ -#if !defined NOT_IN_libc || defined IS_IN_libpthread +#if !defined NOT_IN_libc || IS_IN (libpthread) # define __libc_lock_unlock(NAME) \ lll_unlock (NAME, LLL_PRIVATE) #else |