diff options
Diffstat (limited to 'sysdeps/nptl/bits/libc-lock.h')
| -rw-r--r-- | sysdeps/nptl/bits/libc-lock.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sysdeps/nptl/bits/libc-lock.h b/sysdeps/nptl/bits/libc-lock.h index 2acc6bfcd0..d9a82ad962 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 && !IS_IN (libpthread)) || !defined _LIBC +# if (!IS_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 || IS_IN (libpthread)) +#if defined _LIBC && (IS_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 || IS_IN (libpthread)) +#if defined _LIBC && (IS_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 || IS_IN (libpthread)) +#if defined _LIBC && (IS_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 || IS_IN (libpthread)) +#if defined _LIBC && (IS_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 || IS_IN (libpthread)) +#if defined _LIBC && (IS_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 || IS_IN (libpthread)) +#if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread)) /* We do no error checking here. */ # define __libc_lock_unlock_recursive(NAME) \ do { \ |