From 9dca9ff973287f22534e8b611c6d1da0cd5e073b Mon Sep 17 00:00:00 2001
From: Joakim Tjernlund <joakim.tjernlund@transmode.se>
Date: Tue, 5 Oct 2004 12:06:40 +0000
Subject: Peter S. Mazinger writes: Hello!

The attached patches remove unneeded -D<somedefine>, and uses instead
#ifdef __somedefine__
---
 utils/Makefile | 4 +---
 utils/ldd.c    | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'utils')

diff --git a/utils/Makefile b/utils/Makefile
index 14b78762b..55591c244 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -29,10 +29,8 @@ else
 TARGET_ICONV =
 endif
 
+# do we really need to reset XXFLAGS?
 XXFLAGS=
-ifeq ($(strip $(LDSO_LDD_SUPPORT)),y)
-XXFLAGS+= -D__LDSO_LDD_SUPPORT
-endif
 
 ifeq ($(strip $(HAVE_SHARED)),y)
 all:	$(TARGETS) $(TARGET_ICONV)
diff --git a/utils/ldd.c b/utils/ldd.c
index 55433b601..cc50109fc 100644
--- a/utils/ldd.c
+++ b/utils/ldd.c
@@ -662,7 +662,7 @@ foo:
 	interpreter_already_found=0;
 	interp = find_elf_interpreter(ehdr);
 
-#ifdef __LDSO_LDD_SUPPORT
+#ifdef __LDSO_LDD_SUPPORT__
 	if (interp && (ehdr->e_type == ET_EXEC || ehdr->e_type == ET_DYN) && ehdr->e_ident[EI_CLASS] == ELFCLASSM &&
 			ehdr->e_ident[EI_DATA] == ELFDATAM
 			&& ehdr->e_ident[EI_VERSION] == EV_CURRENT && MATCH_MACHINE(ehdr->e_machine))
-- 
cgit v1.2.3