summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2005-12-10 18:27:03 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2005-12-10 18:27:03 +0000
commit460caef23ff4da3ee374fad644510f57c0624fa5 (patch)
tree21abe4c144ac262fb2899dfc463a1cb7ea622584
parentacb5ff2ef347b7bf9b5e62a2425ca8006b433c09 (diff)
Solve warning about redefined _GNU_SOURCE, allow iconv to build
-rw-r--r--utils/Makefile.in3
-rw-r--r--utils/ldd.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/utils/Makefile.in b/utils/Makefile.in
index 884157c06..0571b5765 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -20,7 +20,8 @@ endif
CFLAGS-ldd := $(CFLAGS-utils-common) $(CFLAGS-utils-shared) -D_GNU_SOURCE
-CFLAGS-iconv := $(CFLAGS-utils-shared) -DL_iconv_main
+# needs CFLAGS-utils explicitely, because the source file is not located in utils
+CFLAGS-iconv := $(CFLAGS-utils) $(CFLAGS-utils-shared) -DL_iconv_main
CFLAGS-readelf := $(CFLAGS-utils-shared)
diff --git a/utils/ldd.c b/utils/ldd.c
index 9196893cb..dbd2f6de8 100644
--- a/utils/ldd.c
+++ b/utils/ldd.c
@@ -26,7 +26,9 @@
*
*/
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
#include <stdlib.h>
#include <stdio.h>
#include <fcntl.h>