bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@24899 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2011-01-04 14:20:17 +00:00
parent 461abb0da4
commit eb65d6fc68
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/libiconv/Makefile
View File

@ -11,7 +11,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libiconv PKG_NAME:=libiconv
PKG_RELEASE:=3 PKG_RELEASE:=4
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

11
libs/libiconv/src/include/iconv.h
View File

@ -1,9 +1,14 @@
#ifndef _ICONV_H #ifndef _ICONV_H
#define _ICONV_H 1 #define _ICONV_H 1
#define _LIBICONV_VERSION 0x010B /* version number: (major<<8) + minor */
#include <stddef.h> #include <stddef.h>
#define _LIBICONV_VERSION 0x010B /* version number: (major<<8) + minor */ #ifdef __cplusplus
extern "C" {
#endif
extern int _libiconv_version; /* Likewise */ extern int _libiconv_version; /* Likewise */
typedef long iconv_t; typedef long iconv_t;
@ -18,4 +23,8 @@ iconv(iconv_t cd, char **inbuf, size_t *inbytesleft,
extern int extern int
iconv_close(iconv_t cd); iconv_close(iconv_t cd);
#ifdef __cplusplus
}
#endif
#endif /* _ICONV_H */ #endif /* _ICONV_H */