From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 4 Jan 2011 14:20:17 +0000 (+0000)
Subject: [packages] libiconv: declare api functions as extern "C", solves linking with C+... 
X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=eb65d6fc68da9cd6d797217e48fba915e24f9312;p=packages.git

[packages] libiconv: declare api functions as extern "C", solves linking with C++ applications (#8529)


git-svn-id: svn://svn.openwrt.org/openwrt/packages@24899 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile
index 5006226cd..b230e6d84 100644
--- a/libs/libiconv/Makefile
+++ b/libs/libiconv/Makefile
@@ -11,7 +11,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libiconv
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/libs/libiconv/src/include/iconv.h b/libs/libiconv/src/include/iconv.h
index bfa08f346..8296f466e 100644
--- a/libs/libiconv/src/include/iconv.h
+++ b/libs/libiconv/src/include/iconv.h
@@ -1,9 +1,14 @@
 #ifndef _ICONV_H
 #define _ICONV_H 1
 
+#define _LIBICONV_VERSION 0x010B    /* version number: (major<<8) + minor */
+
 #include <stddef.h>
 
-#define _LIBICONV_VERSION 0x010B    /* version number: (major<<8) + minor */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern int _libiconv_version; /* Likewise */
 
 typedef long iconv_t;
@@ -18,4 +23,8 @@ iconv(iconv_t cd, char **inbuf, size_t *inbytesleft,
 extern int
 iconv_close(iconv_t cd);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _ICONV_H */