This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 09/19] Remove IS_IN_nscd
- From: Siddhesh Poyarekar <siddhesh at redhat dot com>
- To: libc-alpha at sourceware dot org
- Cc: Siddhesh Poyarekar <siddhesh at redhat dot com>
- Date: Thu, 21 Aug 2014 16:27:33 +0530
- Subject: [PATCH 09/19] Remove IS_IN_nscd
- Authentication-results: sourceware.org; auth=none
- References: <1408618663-2281-1-git-send-email-siddhesh at redhat dot com>
Replace with IS_IN_MODULE (nscd). Generated code unchanged on x86_64.
* include/ifaddrs.h: Use IS_IN.
* inet/check_pf.c: Likewise.
* sysdeps/unix/sysv/linux/check_pf.c: Likewise.
* nscd/Makefile (CPPFLAGS-nscd): Remove IS_IN_nscd.
---
include/ifaddrs.h | 2 +-
inet/check_pf.c | 2 +-
nscd/Makefile | 2 +-
sysdeps/unix/sysv/linux/check_pf.c | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/ifaddrs.h b/include/ifaddrs.h
index e1c6cac..2787f21 100644
--- a/include/ifaddrs.h
+++ b/include/ifaddrs.h
@@ -26,7 +26,7 @@ extern void __check_native (uint32_t a1_index, int *a1_native,
uint32_t a2_index, int *a2_native)
attribute_hidden;
-#ifdef IS_IN_nscd
+#if IS_IN (nscd)
extern uint32_t __bump_nl_timestamp (void) attribute_hidden;
#endif
diff --git a/inet/check_pf.c b/inet/check_pf.c
index b2934f7..c129463 100644
--- a/inet/check_pf.c
+++ b/inet/check_pf.c
@@ -62,7 +62,7 @@ __free_in6ai (struct in6addrinfo *in6ai)
}
-#ifdef IS_IN_nscd
+#if IS_IN (nscd)
uint32_t
__bump_nl_timestamp (void)
{
diff --git a/nscd/Makefile b/nscd/Makefile
index 7ab4e9d..40e99aa 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -79,7 +79,7 @@ CFLAGS-nscd_gethst_r.c = -fexceptions
CFLAGS-nscd_getai.c = -fexceptions
CFLAGS-nscd_initgroups.c = -fexceptions
-CPPFLAGS-nscd += -DIS_IN_nscd=1 -D_FORTIFY_SOURCE=2 -DNOT_IN_libc=1
+CPPFLAGS-nscd += -D_FORTIFY_SOURCE=2 -DNOT_IN_libc
ifeq (yesyes,$(have-fpie)$(build-shared))
CFLAGS-nscd += $(pie-ccflag)
diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
index c7fd9b0..8ec582e 100644
--- a/sysdeps/unix/sysv/linux/check_pf.c
+++ b/sysdeps/unix/sysv/linux/check_pf.c
@@ -65,7 +65,7 @@ static struct cached_data *cache;
__libc_lock_define_initialized (static, lock);
-#ifdef IS_IN_nscd
+#if IS_IN (nscd)
static uint32_t nl_timestamp;
uint32_t
@@ -81,7 +81,7 @@ __bump_nl_timestamp (void)
static inline uint32_t
get_nl_timestamp (void)
{
-#ifdef IS_IN_nscd
+#if IS_IN (nscd)
return nl_timestamp;
#elif defined USE_NSCD
return __nscd_get_nl_timestamp ();
--
1.9.3