Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove IS_IN_nscd
Replace with IS_IN (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.
  • Loading branch information
Siddhesh Poyarekar committed Nov 24, 2014
1 parent fb6784e commit 85f3637
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
5 changes: 5 additions & 0 deletions 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.
Expand Down
2 changes: 1 addition & 1 deletion include/ifaddrs.h
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion inet/check_pf.c
Expand Up @@ -62,7 +62,7 @@ __free_in6ai (struct in6addrinfo *in6ai)
}


#ifdef IS_IN_nscd
#if IS_IN (nscd)
uint32_t
__bump_nl_timestamp (void)
{
Expand Down
2 changes: 1 addition & 1 deletion nscd/Makefile
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions sysdeps/unix/sysv/linux/check_pf.c
Expand Up @@ -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
Expand All @@ -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 ();
Expand Down

0 comments on commit 85f3637

Please sign in to comment.