yugui	2009-01-20 18:53:38 +0900 (Tue, 20 Jan 2009)

  New Revision: 21694

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

  Log:
    merges r21679 from trunk into ruby_1_9_1.
    * ext/nkf/nkf-utf8/nkf.c (nkf_buf_push): maybe a bug.
    * ext/nkf/nkf-utf8/nkf.c (options): no need to support help option.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ext/nkf/nkf-utf8/nkf.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21693)
+++ ruby_1_9_1/ChangeLog	(revision 21694)
@@ -1,3 +1,9 @@
+Tue Jan 20 09:26:05 2009  NAKAMURA Usaku  <usa@r...>
+
+	* ext/nkf/nkf-utf8/nkf.c (nkf_buf_push): maybe a bug.
+
+	* ext/nkf/nkf-utf8/nkf.c (options): no need to support help option.
+
 Tue Jan 20 06:48:56 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* array.c (take_items), enum.c (enum_zip): tries to convert to
Index: ruby_1_9_1/ext/nkf/nkf-utf8/nkf.c
===================================================================
--- ruby_1_9_1/ext/nkf/nkf-utf8/nkf.c	(revision 21693)
+++ ruby_1_9_1/ext/nkf/nkf-utf8/nkf.c	(revision 21694)
@@ -841,7 +841,7 @@
 }
 
 static void
-nkf_buf_push(nkf_buf_t *buf, unsigned char c)
+nkf_buf_push(nkf_buf_t *buf, nkf_char c)
 {
     if (buf->capa <= buf->len) {
 	exit(EXIT_FAILURE);
@@ -5842,10 +5842,12 @@
 		cp_back = cp;
 		cp = (unsigned char *)long_option[i].alias;
 	    }else{
+#ifndef PERL_XS
 		if (strcmp(long_option[i].name, "help") == 0){
 		    usage();
 		    exit(EXIT_SUCCESS);
 		}
+#endif
 		if (strcmp(long_option[i].name, "ic=") == 0){
 		    enc = nkf_enc_find((char *)p);
 		    if (!enc) continue;

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