summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libc/misc/wchar/wstdio.c8
-rw-r--r--utils/Makefile.in3
-rw-r--r--utils/ldd.c4
3 files changed, 9 insertions, 6 deletions
diff --git a/libc/misc/wchar/wstdio.c b/libc/misc/wchar/wstdio.c
index b0f259001..91917683a 100644
--- a/libc/misc/wchar/wstdio.c
+++ b/libc/misc/wchar/wstdio.c
@@ -263,8 +263,8 @@ UNLOCKED(wint_t,fgetwc,(register FILE *stream),(stream))
return wi;
}
-strong_alias(fgetwc_unlocked,getwc_unlocked);
-strong_alias(fgetwc,getwc);
+strong_alias(fgetwc_unlocked,getwc_unlocked)
+strong_alias(fgetwc,getwc)
#endif
/**********************************************************************/
@@ -329,8 +329,8 @@ UNLOCKED(wint_t,fputwc,(wchar_t wc, FILE *stream),(wc, stream))
#endif
}
-strong_alias(fputwc_unlocked,putwc_unlocked);
-strong_alias(fputwc,putwc);
+strong_alias(fputwc_unlocked,putwc_unlocked)
+strong_alias(fputwc,putwc)
#endif
/**********************************************************************/
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>