--- embedaddon/libiconv/include/iconv.h.build.in 2012/02/21 22:57:48 1.1.1.1
+++ embedaddon/libiconv/include/iconv.h.build.in 2021/03/17 13:38:46 1.1.1.3
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2003, 2005-2006, 2008-2009 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2019 Free Software Foundation, Inc.
This file is part of the GNU LIBICONV Library.
The GNU LIBICONV Library is free software; you can redistribute it
@@ -13,18 +13,19 @@
You should have received a copy of the GNU Library General Public
License along with the GNU LIBICONV Library; see the file COPYING.LIB.
- If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
- Fifth Floor, Boston, MA 02110-1301, USA. */
+ If not, see . */
/* When installed, this file is called "iconv.h". */
#ifndef _LIBICONV_H
#define _LIBICONV_H
-#define _LIBICONV_VERSION 0x010D /* version number: (major<<8) + minor */
+#define _LIBICONV_VERSION 0x0110 /* version number: (major<<8) + minor */
#if @HAVE_VISIBILITY@ && BUILDING_LIBICONV
#define LIBICONV_DLL_EXPORTED __attribute__((__visibility__("default")))
+#elif defined _MSC_VER && BUILDING_LIBICONV
+#define LIBICONV_DLL_EXPORTED __declspec(dllexport)
#else
#define LIBICONV_DLL_EXPORTED
#endif
@@ -95,6 +96,11 @@ extern LIBICONV_DLL_EXPORTED size_t iconv (iconv_t cd,
extern LIBICONV_DLL_EXPORTED int iconv_close (iconv_t cd);
+#ifdef __cplusplus
+}
+#endif
+
+
#ifndef LIBICONV_PLUG
/* Nonstandard extensions. */
@@ -112,6 +118,10 @@ extern LIBICONV_DLL_EXPORTED int iconv_close (iconv_t
#include
#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* A type that holds all memory needed by a conversion descriptor.
A pointer to such an object can be used as an iconv_t. */
typedef struct {
@@ -227,13 +237,12 @@ extern LIBICONV_DLL_EXPORTED const char * iconv_canoni
prefixes should be directory names without trailing slash (i.e. use ""
instead of "/"). */
extern LIBICONV_DLL_EXPORTED void libiconv_set_relocation_prefix (const char *orig_prefix,
- const char *curr_prefix);
+ const char *curr_prefix);
-#endif
-
-
#ifdef __cplusplus
}
+#endif
+
#endif