From a2e8052cf1afa7b5fcdc77f3a046b75aa03de5f1 Mon Sep 17 00:00:00 2001 From: jow Date: Mon, 18 Jan 2016 09:23:17 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48301 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- 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 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); -- 2.11.0