mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-04-03 14:23:07 +02:00
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
This commit is contained in:
parent
7f82bb3196
commit
fd54a90954
@ -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>
|
2008-04-03 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
Bug 448943 – g_timeout_add_seconds() problems
|
Bug 448943 – g_timeout_add_seconds() problems
|
||||||
|
@ -188,21 +188,27 @@ static struct {
|
|||||||
{1200, "CP1200"},
|
{1200, "CP1200"},
|
||||||
{1200, "UTF16LE"},
|
{1200, "UTF16LE"},
|
||||||
{1200, "UTF-16LE"},
|
{1200, "UTF-16LE"},
|
||||||
|
{1200, "UCS2LE"},
|
||||||
{1200, "UCS-2LE"},
|
{1200, "UCS-2LE"},
|
||||||
|
|
||||||
{1201, "CP1201"},
|
{1201, "CP1201"},
|
||||||
{1201, "UTF16BE"},
|
{1201, "UTF16BE"},
|
||||||
{1201, "UTF-16BE"},
|
{1201, "UTF-16BE"},
|
||||||
|
{1201, "UCS2BE"},
|
||||||
{1201, "UCS-2BE"},
|
{1201, "UCS-2BE"},
|
||||||
{1201, "unicodeFFFE"},
|
{1201, "unicodeFFFE"},
|
||||||
|
|
||||||
{12000, "CP12000"},
|
{12000, "CP12000"},
|
||||||
{12000, "UTF32LE"},
|
{12000, "UTF32LE"},
|
||||||
{12000, "UTF-32LE"},
|
{12000, "UTF-32LE"},
|
||||||
|
{12000, "UCS4LE"},
|
||||||
|
{12000, "UCS-4LE"},
|
||||||
|
|
||||||
{12001, "CP12001"},
|
{12001, "CP12001"},
|
||||||
{12001, "UTF32BE"},
|
{12001, "UTF32BE"},
|
||||||
{12001, "UTF-32BE"},
|
{12001, "UTF-32BE"},
|
||||||
|
{12001, "UCS4BE"},
|
||||||
|
{12001, "UCS-4BE"},
|
||||||
|
|
||||||
#ifndef GLIB_COMPILATION
|
#ifndef GLIB_COMPILATION
|
||||||
/*
|
/*
|
||||||
@ -213,13 +219,18 @@ static struct {
|
|||||||
{1201, "UTF-16"},
|
{1201, "UTF-16"},
|
||||||
{12001, "UTF32"},
|
{12001, "UTF32"},
|
||||||
{12001, "UTF-32"},
|
{12001, "UTF-32"},
|
||||||
|
{12001, "UCS-4"},
|
||||||
|
{12001, "UCS4"},
|
||||||
#else
|
#else
|
||||||
/* Default is little endian, because the platform is */
|
/* Default is little endian, because the platform is */
|
||||||
{1200, "UTF16"},
|
{1200, "UTF16"},
|
||||||
{1200, "UTF-16"},
|
{1200, "UTF-16"},
|
||||||
|
{1200, "UCS2"},
|
||||||
{1200, "UCS-2"},
|
{1200, "UCS-2"},
|
||||||
{12000, "UTF32"},
|
{12000, "UTF32"},
|
||||||
{12000, "UTF-32"},
|
{12000, "UTF-32"},
|
||||||
|
{12000, "UCS4"},
|
||||||
|
{12000, "UCS-4"},
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* copy from libiconv `iconv -l` */
|
/* copy from libiconv `iconv -l` */
|
||||||
@ -911,14 +922,18 @@ make_csconv(const char *_name)
|
|||||||
cv.wctomb = utf16_wctomb;
|
cv.wctomb = utf16_wctomb;
|
||||||
if (_stricmp(name, "UTF-16") == 0 ||
|
if (_stricmp(name, "UTF-16") == 0 ||
|
||||||
_stricmp(name, "UTF16") == 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;
|
cv.flags |= FLAG_USE_BOM_ENDIAN;
|
||||||
}
|
}
|
||||||
else if (cv.codepage == 12000 || cv.codepage == 12001)
|
else if (cv.codepage == 12000 || cv.codepage == 12001)
|
||||||
{
|
{
|
||||||
cv.mbtowc = utf32_mbtowc;
|
cv.mbtowc = utf32_mbtowc;
|
||||||
cv.wctomb = utf32_wctomb;
|
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;
|
cv.flags |= FLAG_USE_BOM_ENDIAN;
|
||||||
}
|
}
|
||||||
else if (cv.codepage == 65001)
|
else if (cv.codepage == 65001)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user