diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-05-06 23:55:40 +0200 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-05-06 23:55:40 +0200 |
commit | c6fc9fbb8e0d2e0a8147197c31589cdc96497e07 (patch) | |
tree | 51577b62dd3802753fa9cedcaca4f5c0c62da5f3 | |
parent | 0ef7b75c4ba91b6660f0d3d8b51d14d25e3d5bfb (diff) |
Revert "Stop using IS_IN"
This reverts commit 44ae774bed1a75ea926590f1bc7c9f3328219832.
-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 d88afae..84044dc 100644 --- a/pthread/pt-create.c +++ b/pthread/pt-create.c @@ -28,7 +28,7 @@ #include <pt-internal.h> -#if IS_IN (libpthread) +#ifdef 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 -#if IS_IN (libpthread) +#ifdef IS_IN_libpthread /* Initialize pointers to locale data. */ __ctype_init (); #endif diff --git a/pthread/pt-initialize.c b/pthread/pt-initialize.c index 9e5404b..c6489f4 100644 --- a/pthread/pt-initialize.c +++ b/pthread/pt-initialize.c @@ -28,7 +28,7 @@ DEFINE_HOOK (__pthread_init, (void)); -#if IS_IN (libpthread) +#ifdef 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) { -#if IS_IN (libpthread) +#ifdef 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 18b5b4c..f40dd4a 100644 --- a/pthread/pt-internal.h +++ b/pthread/pt-internal.h @@ -60,7 +60,7 @@ enum pthread_state # define PTHREAD_SYSDEP_MEMBERS #endif -#if !(IS_IN (libpthread)) +#ifndef 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 |