summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-24 12:09:39 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-24 12:09:39 +0000
commite6c2ffa981f00c249a9a6a1595ecab18d0a6f741 (patch)
treedfc549711d10dbbdfa6d3c9df3cfb18d86652cb7
parent0114fde85a09b69ad424c9bb239836f4896b016d (diff)
* 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
-rw-r--r--ChangeLog5
-rw-r--r--ext/nkf/nkf-utf8/nkf.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7c31f35..d692133 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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):
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
index 1740b16..8e9d206 100644
--- a/ext/nkf/nkf-utf8/nkf.c
+++ b/ext/nkf/nkf-utf8/nkf.c
@@ -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;