From 44ae774bed1a75ea926590f1bc7c9f3328219832 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu, 12 Feb 2015 23:30:10 +0100
Subject: Stop using IS_IN

* pthread/pt-create.c: Use IS_IN (libpthread) instead of IS_IN_libpthread
* pthread/pt-initialize.c: Likewise.
* pthread/pt-internal.h: Likewise.
---
 pthread/pt-create.c     | 4 ++--
 pthread/pt-initialize.c | 6 +++---
 pthread/pt-internal.h   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'pthread')

diff --git a/pthread/pt-create.c b/pthread/pt-create.c
index 8b95a4b..112ed46 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 831a63d..fc4e137 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,
@@ -65,13 +65,13 @@ static const struct pthread_functions pthread_functions =
     .ptr_pthread_setcanceltype = __pthread_setcanceltype,
     .ptr___pthread_get_cleanup_stack = __pthread_get_cleanup_stack,
   };
-#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 79db55c..fb9267e 100644
--- a/pthread/pt-internal.h
+++ b/pthread/pt-internal.h
@@ -56,7 +56,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
@@ -66,7 +66,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
-- 
cgit v1.2.3