[git commit future 1/1] iconv: Reworked do not include __iconv_codesets into iconv utility
Khem Raj
raj.khem at gmail.com
Sat Mar 19 18:51:25 UTC 2011
commit: http://git.uclibc.org/uClibc/commit/?id=a00ad9648160f51199a6545f2c09c28988ad3825
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/future
Host iconv needs only L_iconv_main defined and __iconv_codesets
has to included, as host system does not provide it.
Keep __iconv_codesets out of iconv linked against uClibc.
Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
libc/misc/wchar/wchar.c | 3 +++
utils/Makefile.in | 3 +--
utils/iconv.c | 7 ++++++-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c
index ab6c617..ed6d3ab 100644
--- a/libc/misc/wchar/wchar.c
+++ b/libc/misc/wchar/wchar.c
@@ -1196,6 +1196,9 @@ libc_hidden_proto(__iconv_codesets)
#endif
#if defined L_iconv || defined L_iconv_main
+# ifdef L_iconv_main
+static
+# endif
const unsigned char __iconv_codesets[] =
"\x0a\xe0""WCHAR_T\x00" /* superset of UCS-4 but platform-endian */
#if __BYTE_ORDER == __BIG_ENDIAN
diff --git a/utils/Makefile.in b/utils/Makefile.in
index 65364d7..e01e170 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -36,8 +36,7 @@ CFLAGS-ldd := $(CFLAGS-utils-shared) -DBUILDING_LINKAGE
# Need CFLAGS-utils explicitly, because the source file is not located in utils
CFLAGS-iconv := $(CFLAGS-utils) \
$(CFLAGS-utils-shared) \
- -I$(top_srcdir)libc/misc/wchar \
- -DL_iconv_main \
+ -I$(top_srcdir)libc/misc/wchar
CFLAGS-locale := $(CFLAGS-utils)
CFLAGS-getconf :=$(CFLAGS-utils) \
diff --git a/utils/iconv.c b/utils/iconv.c
index 04e2c32..a0260df 100644
--- a/utils/iconv.c
+++ b/utils/iconv.c
@@ -108,7 +108,12 @@
#include <wchar.h>
#include "wchar.c" /* for _UC_iconv_t and __iconv_codesets */
-extern const unsigned char __iconv_codesets[];
+#ifdef L_iconv_main
+static
+#else
+extern
+#endif
+const unsigned char __iconv_codesets[];
#define IBUF BUFSIZ
#define OBUF BUFSIZ
--
1.7.3.4
More information about the uClibc-cvs
mailing list