diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | include/ifaddrs.h | 2 | ||||
| -rw-r--r-- | inet/check_pf.c | 2 | ||||
| -rw-r--r-- | nscd/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/check_pf.c | 4 |
5 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 8f06d54b28..67aac82dc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2014-11-24 Siddhesh Poyarekar <siddhesh@redhat.com> + * 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. + * elf/Makefile (CFLAGS-ldconfig.c): Remove definition of IS_IN_ldconfig. * sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c: Use IS_IN. diff --git a/include/ifaddrs.h b/include/ifaddrs.h index e1c6cac114..2787f21115 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 b2934f7718..c129463c48 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 7ab4e9de9d..40e99aa54c 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 976f249e20..4ba13e2e3b 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 (); |