yugui	2008-11-22 21:12:16 +0900 (Sat, 22 Nov 2008)

  New Revision: 20310

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

  Log:
    merges r20275 from trunk into ruby_1_9_1.
    * error.c (Init_syserr): moved function definition itself from
      template/known_errors.inc.tmpl.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/error.c
    branches/ruby_1_9_1/template/known_errors.inc.tmpl

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20309)
+++ ruby_1_9_1/ChangeLog	(revision 20310)
@@ -1,3 +1,8 @@
+Wed Nov 19 02:39:31 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* error.c (Init_syserr): moved function definition itself from
+	  template/known_errors.inc.tmpl.
+
 Wed Nov 19 01:10:52 2008  Masatoshi SEKI  <m_seki@m...>
 
 	* lib/drb/drb.rb (DRbConn::alive?): fixed NoMethodError problem
Index: ruby_1_9_1/error.c
===================================================================
--- ruby_1_9_1/error.c	(revision 20309)
+++ ruby_1_9_1/error.c	(revision 20310)
@@ -1157,7 +1157,11 @@
     if (OBJ_FROZEN(obj)) rb_error_frozen(rb_obj_classname(obj));
 }
 
+void Init_syserr(void)
+{
+    rb_eNOERROR = set_syserr(0, "NOERROR");
 #include "known_errors.inc"
+}
 
 static void
 err_append(const char *s)
Index: ruby_1_9_1/template/known_errors.inc.tmpl
===================================================================
--- ruby_1_9_1/template/known_errors.inc.tmpl	(revision 20309)
+++ ruby_1_9_1/template/known_errors.inc.tmpl	(revision 20310)
@@ -5,8 +5,6 @@
  */
 
 % error_names = ARGF.read.split(/\s+/)
-void Init_syserr(void) {
-    rb_eNOERROR = set_syserr(0, "NOERROR");
 % error_names.each do |name|
 #ifdef <%=name%>
         set_syserr(<%=name%>, "<%=name%>");
@@ -14,4 +12,3 @@
         set_syserr(0, "<%=name%>");
 #endif
 % end
-}

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