File win_iconv-tml.diff of Package mingw32-win_iconv

Overview Repositories Revisions Requests Users Attributes Meta

File win_iconv-tml.diff of Package mingw32-win_iconv (Revision 2dcbdcc86ce2be8d04e8f0fcbb6b73aa)

Currently displaying revision 2dcbdcc86ce2be8d04e8f0fcbb6b73aa , Show latest

--- src/win_iconv.c	2009-02-13 09:39:29.000000000 +0100
+++ src/win_iconv.c	2008-04-03 16:59:48.000000000 +0200
@@ -24,6 +24,7 @@
 # define WINVER 0x0500
 #endif
 
+#define STRICT
 #include <windows.h>
 #include <errno.h>
 #include <string.h>
@@ -187,21 +188,27 @@
     {1200, "CP1200"},
     {1200, "UTF16LE"},
     {1200, "UTF-16LE"},
+    {1200, "UCS2LE"},
     {1200, "UCS-2LE"},
 
     {1201, "CP1201"},
     {1201, "UTF16BE"},
     {1201, "UTF-16BE"},
+    {1201, "UCS2BE"},
     {1201, "UCS-2BE"},
     {1201, "unicodeFFFE"},
 
     {12000, "CP12000"},
     {12000, "UTF32LE"},
     {12000, "UTF-32LE"},
+    {12000, "UCS4LE"},
+    {12000, "UCS-4LE"},
 
     {12001, "CP12001"},
     {12001, "UTF32BE"},
     {12001, "UTF-32BE"},
+    {12001, "UCS4BE"},
+    {12001, "UCS-4BE"},
 
 #ifndef GLIB_COMPILATION
     /*
@@ -212,13 +219,18 @@
     {1201, "UTF-16"},
     {12001, "UTF32"},
     {12001, "UTF-32"},
+    {12001, "UCS-4"},
+    {12001, "UCS4"},
 #else
     /* Default is little endian, because the platform is */
     {1200, "UTF16"},
     {1200, "UTF-16"},
+    {1200, "UCS2"},
     {1200, "UCS-2"},
     {12000, "UTF32"},
     {12000, "UTF-32"},
+    {12000, "UCS4"},
+    {12000, "UCS-4"},
 #endif
 
     /* copy from libiconv `iconv -l` */
@@ -910,14 +922,18 @@
         cv.wctomb = utf16_wctomb;
         if (_stricmp(name, "UTF-16") == 0 ||
 	    _stricmp(name, "UTF16") == 0 ||
-	    _stricmp(name, "UCS-2") == 0)
+	    _stricmp(name, "UCS-2") == 0 ||
+	    _stricmp(name, "UCS2") == 0)
             cv.flags |= FLAG_USE_BOM_ENDIAN;
     }
     else if (cv.codepage == 12000 || cv.codepage == 12001)
     {
         cv.mbtowc = utf32_mbtowc;
         cv.wctomb = utf32_wctomb;
-        if (_stricmp(name, "UTF-32") == 0 || _stricmp(name, "UTF32") == 0)
+        if (_stricmp(name, "UTF-32") == 0 ||
+	    _stricmp(name, "UTF32") == 0 ||
+	    _stricmp(name, "UCS-4") == 0 ||
+	    _stricmp(name, "UCS4") == 0)
             cv.flags |= FLAG_USE_BOM_ENDIAN;
     }
     else if (cv.codepage == 65001)
--- src/iconv.h.orig	2008-03-19 23:43:38.000000000 +0100
+++ src/iconv.h	2009-02-13 10:03:41.000000000 +0100
@@ -1,5 +1,14 @@
+#ifndef ICONV_H_INCLUDED
+#define ICONV_H_INCLUDED 1
 #include <stddef.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
 typedef void* iconv_t;
 iconv_t iconv_open(const char *tocode, const char *fromcode);
 int iconv_close(iconv_t cd);
 size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
+#ifdef __cplusplus
+}
+#endif
+#endif

Places

File win_iconv-tml.diff of Package mingw32-win_iconv (Revision 2dcbdcc86ce2be8d04e8f0fcbb6b73aa)

Places