--- embedaddon/libiconv/include/iconv.h.in	2012/02/21 22:57:48	1.1.1.1
+++ embedaddon/libiconv/include/iconv.h.in	2012/05/29 09:29:43	1.1.1.2
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2003, 2005-2006, 2008-2009 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2003, 2005-2006, 2008-2011 Free Software Foundation, Inc.
    This file is part of the GNU LIBICONV Library.
 
    The GNU LIBICONV Library is free software; you can redistribute it
@@ -21,7 +21,7 @@
 #ifndef _LIBICONV_H
 #define _LIBICONV_H
 
-#define _LIBICONV_VERSION 0x010D    /* version number: (major<<8) + minor */
+#define _LIBICONV_VERSION 0x010E    /* version number: (major<<8) + minor */
 extern @DLL_VARIABLE@ int _libiconv_version; /* Likewise */
 
 /* We would like to #include any system header file which could define
@@ -89,6 +89,11 @@ extern size_t iconv (iconv_t cd, @ICONV_CONST@ char* *
 extern int iconv_close (iconv_t cd);
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #ifndef LIBICONV_PLUG
 
 /* Nonstandard extensions. */
@@ -106,6 +111,10 @@ extern int iconv_close (iconv_t cd);
 #include <wchar.h>
 #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 {
@@ -221,13 +230,12 @@ extern const char * iconv_canonicalize (const char * n
    prefixes should be directory names without trailing slash (i.e. use ""
    instead of "/").  */
 extern void libiconv_set_relocation_prefix (const char *orig_prefix,
-					    const char *curr_prefix);
+                                            const char *curr_prefix);
 
-#endif
-
-
 #ifdef __cplusplus
 }
+#endif
+
 #endif