aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2016-01-18 09:23:17 +0000
committerJo-Philipp Wich <jow@openwrt.org>2016-01-18 09:23:17 +0000
commitee0c0ca912bd7581b881e1c2520b41b0731f54bc (patch)
tree83d3785d2b0f7379563849cf33bd4c91886f922c /package
parentb9ffb2115b97227ff2b9accf22240832426dce29 (diff)
downloadmaster-187ad058-ee0c0ca912bd7581b881e1c2520b41b0731f54bc.tar.gz
master-187ad058-ee0c0ca912bd7581b881e1c2520b41b0731f54bc.tar.bz2
master-187ad058-ee0c0ca912bd7581b881e1c2520b41b0731f54bc.zip
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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48301 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/libs/libiconv/src/include/iconv.h4
1 files changed, 4 insertions, 0 deletions
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);