From 7c8c81c79489ff18e56cb1a8f147a19b0d3c63ab Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 4 Jan 2011 14:20:17 +0000 Subject: [PATCH] [packages] libiconv: declare api functions as extern "C", solves linking with C++ applications (#8529) SVN-Revision: 24899 --- libs/libiconv/Makefile | 2 +- libs/libiconv/src/include/iconv.h | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile index 5006226cda..b230e6d84a 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 bfa08f346d..8296f466ed 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 -#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 */ -- 2.30.2