naruse	2012-11-24 21:09:39 +0900 (Sat, 24 Nov 2012)

  New Revision: 37833

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37833

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

  Modified files:
    trunk/ChangeLog
    trunk/ext/nkf/nkf-utf8/nkf.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37832)
+++ ChangeLog	(revision 37833)
@@ -1,3 +1,8 @@
+Sat Nov 24 19:44:41 2012  NARUSE, Yui  <naruse@r...>
+
+	* ext/nkf/nkf-utf8/nkf.c (unicode_iconv_combine): returning flags are
+	  nkf_char.
+
 Sat Nov 24 19:29:18 2012  Tadayoshi Funaba  <tadf@d...>
 
 	* test/ruby/test_rubyoptions.rb (test_usage, test_usage_long):
Index: ext/nkf/nkf-utf8/nkf.c
===================================================================
--- ext/nkf/nkf-utf8/nkf.c	(revision 37832)
+++ ext/nkf/nkf-utf8/nkf.c	(revision 37833)
@@ -2346,7 +2346,7 @@
     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 @@
     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;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/