This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 08/19] Remove IS_IN_ldconfig
- 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:32 +0530
- Subject: [PATCH 08/19] Remove IS_IN_ldconfig
- Authentication-results: sourceware.org; auth=none
- References: <1408618663-2281-1-git-send-email-siddhesh at redhat dot com>
Replace with IS_IN(). No change in generated code.
* elf/Makefile (CFLAGS-ldconfig.c): Remove definition of
IS_IN_ldconfig.
* sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c: Use IS_IN.
* sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h: Likewise.
---
elf/Makefile | 2 +-
sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c | 2 +-
sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/elf/Makefile b/elf/Makefile
index d93898f..2781cc3 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -432,7 +432,7 @@ $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"'
CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \
- -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1 -DNOT_IN_libc=1
+ -D'SLIBDIR="$(slibdir)"' -DNOT_IN_libc
libof-ldconfig = ldconfig
CFLAGS-dl-cache.c = $(SYSCONF-FLAGS)
CFLAGS-cache.c = $(SYSCONF-FLAGS)
diff --git a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c
index 6662a94..8ac351e 100644
--- a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c
+++ b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c
@@ -1,4 +1,4 @@
-#ifdef IS_IN_ldconfig
+#if IS_IN (ldconfig)
# include <sysdeps/i386/dl-procinfo.c>
#else
# include <sysdeps/generic/dl-procinfo.c>
diff --git a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h
index 3145520..7829e1c 100644
--- a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h
+++ b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h
@@ -1,4 +1,4 @@
-#ifdef IS_IN_ldconfig
+#if IS_IN (ldconfig)
# include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
#else
# include <sysdeps/generic/dl-procinfo.h>
--
1.9.3