1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* ext/nkf/nkf-utf8/nkf.c (unicode_iconv_combine): returning flags are

nkf_char.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37833 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-11-24 12:09:39 +00:00
parent 0114fde85a
commit e6c2ffa981
2 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Sat Nov 24 19:44:41 2012 NARUSE, Yui <naruse@ruby-lang.org>
* ext/nkf/nkf-utf8/nkf.c (unicode_iconv_combine): returning flags are
nkf_char.
Sat Nov 24 19:29:18 2012 Tadayoshi Funaba <tadf@dotrb.org>
* test/ruby/test_rubyoptions.rb (test_usage, test_usage_long):

View file

@ -2346,7 +2346,7 @@ unicode_iconv(nkf_char wc, int nocombine)
return 0;
}
static size_t
static nkf_char
unicode_iconv_combine(nkf_char wc, nkf_char wc2)
{
nkf_char c1, c2;
@ -2511,7 +2511,7 @@ nkf_iconv_utf_32(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
return (*unicode_iconv)(wc, FALSE);
}
static size_t
static nkf_char
nkf_iconv_utf_32_combine(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4, nkf_char c5, nkf_char c6, nkf_char c7, nkf_char c8)
{
nkf_char wc, wc2;