Bug 525972 - UCS-4 not in the new win_iconv implementation

2008-04-03  Tor Lillqvist  <tml@novell.com>

	Bug 525972 - UCS-4 not in the new win_iconv implementation

	* glib/win_iconv.c: Add UCS-4. Also add spelling of UCS-2 without
	the hyphen.

svn path=/trunk/; revision=6816

diff --git a/ChangeLog b/ChangeLog
index aac81ebd19d07a13e0cccf090facbfcbee65befb..b313317f1def1d7423d40e0cc02227174350ed48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-03  Tor Lillqvist  <tml@novell.com>
+
+       Bug 525972 - UCS-4 not in the new win_iconv implementation
+
+       * glib/win_iconv.c: Add UCS-4. Also add spelling of UCS-2 without
+       the hyphen.
+
 2008-04-03  Matthias Clasen  <mclasen@redhat.com>
 
        Bug 448943 – g_timeout_add_seconds() problems

diff --git a/glib/win_iconv.c b/glib/win_iconv.c
index 277087866b4de8dcfeb51e92a7b7fcb78be8b4ad..b8ee710993cef76f071ad5996569171282cf90b3 100644 (file)
--- a/glib/win_iconv.c
+++ b/glib/win_iconv.c
@@ -188,21 +188,27 @@ static struct {
     {1200, "CP1200"},\r
     {1200, "UTF16LE"},\r
     {1200, "UTF-16LE"},\r
+    {1200, "UCS2LE"},\r
     {1200, "UCS-2LE"},\r
 \r
     {1201, "CP1201"},\r
     {1201, "UTF16BE"},\r
     {1201, "UTF-16BE"},\r
+    {1201, "UCS2BE"},\r
     {1201, "UCS-2BE"},\r
     {1201, "unicodeFFFE"},\r
 \r
     {12000, "CP12000"},\r
     {12000, "UTF32LE"},\r
     {12000, "UTF-32LE"},\r
+    {12000, "UCS4LE"},\r
+    {12000, "UCS-4LE"},\r
 \r
     {12001, "CP12001"},\r
     {12001, "UTF32BE"},\r
     {12001, "UTF-32BE"},\r
+    {12001, "UCS4BE"},\r
+    {12001, "UCS-4BE"},\r
 \r
 #ifndef GLIB_COMPILATION\r
     /*\r
@@ -213,13 +219,18 @@ static struct {
     {1201, "UTF-16"},\r
     {12001, "UTF32"},\r
     {12001, "UTF-32"},\r
+    {12001, "UCS-4"},\r
+    {12001, "UCS4"},\r
 #else\r
     /* Default is little endian, because the platform is */\r
     {1200, "UTF16"},\r
     {1200, "UTF-16"},\r
+    {1200, "UCS2"},\r
     {1200, "UCS-2"},\r
     {12000, "UTF32"},\r
     {12000, "UTF-32"},\r
+    {12000, "UCS4"},\r
+    {12000, "UCS-4"},\r
 #endif\r
 \r
     /* copy from libiconv `iconv -l` */\r
@@ -911,14 +922,18 @@ make_csconv(const char *_name)
         cv.wctomb = utf16_wctomb;\r
         if (_stricmp(name, "UTF-16") == 0 ||\r
            _stricmp(name, "UTF16") == 0 ||\r
-           _stricmp(name, "UCS-2") == 0)\r
+           _stricmp(name, "UCS-2") == 0 ||\r
+           _stricmp(name, "UCS2") == 0)\r
             cv.flags |= FLAG_USE_BOM_ENDIAN;\r
     }\r
     else if (cv.codepage == 12000 || cv.codepage == 12001)\r
     {\r
         cv.mbtowc = utf32_mbtowc;\r
         cv.wctomb = utf32_wctomb;\r
-        if (_stricmp(name, "UTF-32") == 0 || _stricmp(name, "UTF32") == 0)\r
+        if (_stricmp(name, "UTF-32") == 0 ||\r
+           _stricmp(name, "UTF32") == 0 ||\r
+           _stricmp(name, "UCS-4") == 0 ||\r
+           _stricmp(name, "UCS4") == 0)\r
             cv.flags |= FLAG_USE_BOM_ENDIAN;\r
     }\r
     else if (cv.codepage == 65001)\r