diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-10 19:12:19 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-10 19:12:19 +0000 |
| commit | f335b8c0ffb5fd7ae44d154900d78988b6abf769 (patch) | |
| tree | 58b262177b70dda93f8d01d16efa031eecc07ff8 | |
| parent | 187eb613ecbfb6350ba8eba34601f47b70b61b3a (diff) | |
| download | uClibc-alpine-f335b8c0ffb5fd7ae44d154900d78988b6abf769.tar.bz2 uClibc-alpine-f335b8c0ffb5fd7ae44d154900d78988b6abf769.tar.xz | |
Merge from trunk.
| -rw-r--r-- | libc/misc/wchar/wstdio.c | 8 | ||||
| -rw-r--r-- | utils/Makefile.in | 3 | ||||
| -rw-r--r-- | utils/ldd.c | 4 |
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> |