Peter S. Mazinger writes:

Hello!

The attached patches remove unneeded -D<somedefine>, and uses instead
#ifdef __somedefine__

diff --git a/utils/Makefile b/utils/Makefile
index 14b7876..55591c2 100644 (file)
--- 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 55433b6..cc50109 100644 (file)
--- 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))