Selaa lähdekoodia

Solve warning about redefined _GNU_SOURCE, allow iconv to build

Peter S. Mazinger 18 vuotta sitten
vanhempi
commit
460caef23f
2 muutettua tiedostoa jossa 5 lisäystä ja 2 poistoa
  1. 2 1
      utils/Makefile.in
  2. 3 1
      utils/ldd.c

+ 2 - 1
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)
 

+ 3 - 1
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>