diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-05-06 23:56:14 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-05-06 23:56:14 +0200 |
| commit | 23f9ae74c645691a00004bc9d85741f3ca4bafa9 (patch) | |
| tree | 1f8021dd18bf296cc3f688656234e28f62236bfb | |
| parent | c6fc9fbb8e0d2e0a8147197c31589cdc96497e07 (diff) | |
Revert "Revert "Stop using IS_IN""glibc-2.21-hurd1
This reverts commit c6fc9fbb8e0d2e0a8147197c31589cdc96497e07.
| -rw-r--r-- | pthread/pt-create.c | 4 | ||||
| -rw-r--r-- | pthread/pt-initialize.c | 6 | ||||
| -rw-r--r-- | pthread/pt-internal.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pthread/pt-create.c b/pthread/pt-create.c index 84044dc..d88afae 100644 --- a/pthread/pt-create.c +++ b/pthread/pt-create.c @@ -28,7 +28,7 @@ #include <pt-internal.h> -#ifdef IS_IN_libpthread +#if IS_IN (libpthread) # include <ctype.h> #endif #ifdef HAVE_USELOCALE @@ -50,7 +50,7 @@ entry_point (struct __pthread *self, void *(*start_routine)(void *), void *arg) __resp = &self->res_state; #endif -#ifdef IS_IN_libpthread +#if IS_IN (libpthread) /* Initialize pointers to locale data. */ __ctype_init (); #endif diff --git a/pthread/pt-initialize.c b/pthread/pt-initialize.c index c6489f4..9e5404b 100644 --- a/pthread/pt-initialize.c +++ b/pthread/pt-initialize.c @@ -28,7 +28,7 @@ DEFINE_HOOK (__pthread_init, (void)); -#ifdef IS_IN_libpthread +#if IS_IN (libpthread) static const struct pthread_functions pthread_functions = { .ptr_pthread_attr_destroy = __pthread_attr_destroy, @@ -75,13 +75,13 @@ static const struct pthread_functions pthread_functions = .ptr__IO_funlockfile = _cthreads_funlockfile, .ptr__IO_ftrylockfile = _cthreads_ftrylockfile, }; -#endif /* IS_IN_libpthread */ +#endif /* IS_IN (libpthread) */ /* Initialize the pthreads library. */ void ___pthread_init (void) { -#ifdef IS_IN_libpthread +#if IS_IN (libpthread) __libc_pthread_init(&pthread_functions); #endif RUN_HOOK (__pthread_init, ()); diff --git a/pthread/pt-internal.h b/pthread/pt-internal.h index f40dd4a..18b5b4c 100644 --- a/pthread/pt-internal.h +++ b/pthread/pt-internal.h @@ -60,7 +60,7 @@ enum pthread_state # define PTHREAD_SYSDEP_MEMBERS #endif -#ifndef IS_IN_libpthread +#if !(IS_IN (libpthread)) #ifdef ENABLE_TLS /* Type of the TCB. */ typedef struct @@ -70,7 +70,7 @@ typedef struct thread_t self; /* This thread's control port. */ } tcbhead_t; #endif /* ENABLE_TLS */ -#endif /* IS_IN_libpthread */ +#endif /* ! IS_IN (libpthread) */ /* This structure describes a POSIX thread. */ struct __pthread |