[OpenWrt-Devel] [PATCH 1/1] package/libs/libiconv: function names

Heinrich Schuchardt xypron.glpk at gmx.de
Mon Jan 18 01:28:35 EST 2016


Currently libiconv-stub and libiconv-full use different names
for functions iconv, iconv_open, and iconv_close.

This may lead to failures when building modules, e.g. with
apr-util when NLS is not activated.

The two modules libiconv-stub and libiconv-full should be
interchangeable, so we need the same function names.

cf.
http://git.savannah.gnu.org/cgit/libiconv.git/tree/include/iconv.h.in

After applying this patch execute

	make distclean

Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
---
 package/libs/libiconv/src/include/iconv.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/libs/libiconv/src/include/iconv.h b/package/libs/libiconv/src/include/iconv.h
index dfab27f..64acb6f 100644
--- a/package/libs/libiconv/src/include/iconv.h
+++ b/package/libs/libiconv/src/include/iconv.h
@@ -13,6 +13,10 @@ extern int _libiconv_version; /* Likewise */
 
 typedef long iconv_t;
 
+#define iconv_open libiconv_open
+#define iconv libiconv
+#define iconv_close libiconv_close
+
 extern iconv_t
 iconv_open(const char *tocode, const char *fromcode);
 
-- 
2.1.4
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list