From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 18 Jan 2016 09:23:17 +0000 (+0000)
Subject: package/libs/libiconv: function names
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1bd8400752dc5e24b77ea83129c7b4a842ccdb10;p=openwrt%2Fstaging%2Fzorun.git

package/libs/libiconv: function names

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@gmx.de>

SVN-Revision: 48301
---

diff --git a/package/libs/libiconv/src/include/iconv.h b/package/libs/libiconv/src/include/iconv.h
index dfab27f053..64acb6fd56 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);