glib r6604 - in trunk: . glib
- From: tml svn gnome org
- To: svn-commits-list gnome org
- Subject: glib r6604 - in trunk: . glib
- Date: Thu, 28 Feb 2008 22:59:39 +0000 (GMT)
Author: tml
Date: Thu Feb 28 22:59:39 2008
New Revision: 6604
URL: http://svn.gnome.org/viewvc/glib?rev=6604&view=rev
Log:
2008-02-29 Tor Lillqvist <tml novell com>
* glib/win_iconv.c (name_to_codepage): Add some GNU libiconv
compatibility: Recognize "" and "char" as aliases for the current
locale's charset. (We use the system ANSI codepage as returned by
GetACP().) Recognize "wchar_t" as an alias for UTF-16LE.
Modified:
trunk/ChangeLog
trunk/glib/win_iconv.c
Modified: trunk/glib/win_iconv.c
==============================================================================
--- trunk/glib/win_iconv.c (original)
+++ trunk/glib/win_iconv.c Thu Feb 28 22:59:39 2008
@@ -953,7 +953,12 @@
{
int i;
- if (_strnicmp(name, "cp", 2) == 0)
+ if (*name == '\0' ||
+ strcmp(name, "char") == 0)
+ return GetACP();
+ else if (strcmp(name, "wchar_t") == 0)
+ return 1200;
+ else if (_strnicmp(name, "cp", 2) == 0)
return atoi(name + 2); /* CP123 */
else if ('0' <= name[0] && name[0] <= '9')
return atoi(name); /* 123 */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]