diff options
| author | Bill Holmes <holmes@mono-cvs.ximian.com> | 2008-11-05 21:49:12 +0300 |
|---|---|---|
| committer | Bill Holmes <holmes@mono-cvs.ximian.com> | 2008-11-05 21:49:12 +0300 |
| commit | 1d704c8b4d35479039b72e1cf4b407e97fe9b4f1 (patch) | |
| tree | 639b37be928ec8b76e8ba88e6562a880c25ad5c4 /eglib | |
| parent | 690fe2e90d62d311b1d6331ebc76af5eb47bf555 (diff) | |
2008-11-05 Bill Holmes <billholmes54@gmail.com>
* src/gutf8.c, src/unicode-data.h, src/gunicode.c :
Fixing the MSVC builds.
Contributed under MIT/X11 license.
svn path=/trunk/mono/; revision=118012
Diffstat (limited to 'eglib')
| -rw-r--r-- | eglib/ChangeLog | 7 | ||||
| -rw-r--r-- | eglib/src/gunicode.c | 7 | ||||
| -rw-r--r-- | eglib/src/gutf8.c | 8 | ||||
| -rw-r--r-- | eglib/src/unicode-data.h | 4 |
4 files changed, 17 insertions, 9 deletions
diff --git a/eglib/ChangeLog b/eglib/ChangeLog index 4f742d12aef..4a4ce2a678f 100644 --- a/eglib/ChangeLog +++ b/eglib/ChangeLog @@ -1,3 +1,10 @@ +2008-11-05 Bill Holmes <billholmes54@gmail.com> + + * src/gutf8.c, src/unicode-data.h, src/gunicode.c : + Fixing the MSVC builds. + + Contributed under MIT/X11 license. + 2008-11-04 Atsushi Enomoto <atsushi@ximian.com> * src/gutf8.c, src/gunicode.c, src/glib.h: diff --git a/eglib/src/gunicode.c b/eglib/src/gunicode.c index 0f7196221f2..11dc508d9a0 100644 --- a/eglib/src/gunicode.c +++ b/eglib/src/gunicode.c @@ -132,11 +132,12 @@ g_unichar_case (gunichar c, gboolean upper) if (simple_case_map_ranges [i].end <= cp) continue; if (c < 0x10000) { - guint16 *tab = upper ? simple_upper_case_mapping_lowarea [i] : simple_lower_case_mapping_lowarea [i]; + const guint16 *tab = upper ? simple_upper_case_mapping_lowarea [i] : simple_lower_case_mapping_lowarea [i]; v = tab [cp - simple_case_map_ranges [i].start]; } else { - i2 = i - (upper ? simple_upper_case_mapping_lowarea_table_count : simple_lower_case_mapping_lowarea_table_count); - guint32 *tab = upper ? simple_upper_case_mapping_higharea [i2] : simple_lower_case_mapping_higharea [i2]; + const guint32 *tab; + i2 = (gint8)(i - (upper ? simple_upper_case_mapping_lowarea_table_count : simple_lower_case_mapping_lowarea_table_count)); + tab = upper ? simple_upper_case_mapping_higharea [i2] : simple_lower_case_mapping_higharea [i2]; v = tab [cp - simple_case_map_ranges [i].start]; } return v != 0 ? (gunichar) v : c; diff --git a/eglib/src/gutf8.c b/eglib/src/gutf8.c index 9d5786951b1..1abdb291dda 100644 --- a/eglib/src/gutf8.c +++ b/eglib/src/gutf8.c @@ -30,7 +30,7 @@ utf8_case_conv (const gchar *str, gssize len, gboolean upper) gchar *u8str; GError **err = NULL; - u16str = g_utf8_to_utf16 (str, len, NULL, &u16len, err); + u16str = g_utf8_to_utf16 (str, (glong)len, NULL, &u16len, err); u32str = g_utf16_to_ucs4 (u16str, u16len, NULL, &u32len, err); for (i = 0; i < u32len; i++) { u32str [i] = upper ? g_unichar_toupper (u32str [i]) : g_unichar_tolower (u32str [i]); @@ -40,19 +40,19 @@ utf8_case_conv (const gchar *str, gssize len, gboolean upper) u8str = g_utf16_to_utf8 (u16str, u16len, NULL, NULL, err); g_free (u32str); g_free (u16str); - return u8str; + return (gunichar*)u8str; } gchar* g_utf8_strup (const gchar *str, gssize len) { - return utf8_case_conv (str, len, TRUE); + return (gchar*)utf8_case_conv (str, len, TRUE); } gchar* g_utf8_strdown (const gchar *str, gssize len) { - return utf8_case_conv (str, len, FALSE); + return (gchar*)utf8_case_conv (str, len, FALSE); } gunichar2* diff --git a/eglib/src/unicode-data.h b/eglib/src/unicode-data.h index 12f6baab8d4..d751aabe6f6 100644 --- a/eglib/src/unicode-data.h +++ b/eglib/src/unicode-data.h @@ -1847,7 +1847,7 @@ static const guint16 *simple_upper_case_mapping_lowarea [] = { simple_upper_case_mapping_lowarea_table5, simple_upper_case_mapping_lowarea_table6, simple_upper_case_mapping_lowarea_table7}; -simple_upper_case_mapping_lowarea_table_count = 8; +static const int simple_upper_case_mapping_lowarea_table_count = 8; static const guint32 simple_upper_case_mapping_higharea_table0 [] = { /* ==== 10400-10480 ==== */ @@ -2115,7 +2115,7 @@ static const guint16 *simple_lower_case_mapping_lowarea [] = { simple_lower_case_mapping_lowarea_table5, simple_lower_case_mapping_lowarea_table6, simple_lower_case_mapping_lowarea_table7}; -simple_lower_case_mapping_lowarea_table_count = 8; +static const int simple_lower_case_mapping_lowarea_table_count = 8; static const guint32 simple_lower_case_mapping_higharea_table0 [] = { /* ==== 10400-10480 ==== */ |