diff options
| author | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-08-21 14:29:19 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-11-05 16:09:40 +0530 |
| commit | b36fa5e6c65918158aca3586dfa701644f5e2e56 (patch) | |
| tree | 50e2bdf861276d1b6a7008857e9d7fde3aba92f9 | |
| parent | 5d7a010a415e413435e4fa64db092077f6753cfa (diff) | |
| download | glibc-b36fa5e6c65918158aca3586dfa701644f5e2e56.tar.gz glibc-b36fa5e6c65918158aca3586dfa701644f5e2e56.tar.xz glibc-b36fa5e6c65918158aca3586dfa701644f5e2e56.zip | |
Remove IS_IN_ldconfig
Replace with IS_IN (ldconfig). 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.
| -rw-r--r-- | elf/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c | 2 | ||||
| -rw-r--r-- | 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 7a5a9aad9a..718a05251c 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -437,7 +437,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 6662a94d09..8ac351ec97 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 31455204c3..7829e1cd67 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> |