mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-08 14:20:07 +00:00
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.
This commit is contained in:
parent
fb6784e306
commit
85f36372aa
@ -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.
|
||||
|
@ -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
|
||||
|
||||
|
@ -62,7 +62,7 @@ __free_in6ai (struct in6addrinfo *in6ai)
|
||||
}
|
||||
|
||||
|
||||
#ifdef IS_IN_nscd
|
||||
#if IS_IN (nscd)
|
||||
uint32_t
|
||||
__bump_nl_timestamp (void)
|
||||
{
|
||||
|
@ -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)
|
||||
|
@ -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 ();
|
||||
|
Loading…
Reference in New Issue
Block a user