yugui	2008-12-12 23:54:57 +0900 (Fri, 12 Dec 2008)

  New Revision: 20679

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

  Log:
    merges r20591 from trunk into ruby_1_9_1.
    * cont.c (fiber_status), template/insns.inc.tmpl (ruby_vminsn_type),
      vm_insnhelper.h (BOP): ISO C forbids comma at end of enumerator
      list.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/cont.c
    branches/ruby_1_9_1/template/insns.inc.tmpl
    branches/ruby_1_9_1/vm_insnhelper.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20678)
+++ ruby_1_9_1/ChangeLog	(revision 20679)
@@ -1,3 +1,11 @@
+Tue Dec  9 13:25:51 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* cont.c (fiber_status), template/insns.inc.tmpl (ruby_vminsn_type),
+	  vm_insnhelper.h (BOP): ISO C forbids comma at end of enumerator
+	  list.
+
+	* vm_insnhelper.c (check_cfunc): use function pointer.
+
 Tue Dec  9 12:08:47 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* .gdbinit (rp): fixed typo for T_STRUCT.
Index: ruby_1_9_1/cont.c
===================================================================
--- ruby_1_9_1/cont.c	(revision 20678)
+++ ruby_1_9_1/cont.c	(revision 20679)
@@ -47,7 +47,7 @@
 enum fiber_status {
     CREATED,
     RUNNING,
-    TERMINATED,
+    TERMINATED
 };
 
 typedef struct rb_fiber_struct {
Index: ruby_1_9_1/vm_insnhelper.h
===================================================================
--- ruby_1_9_1/vm_insnhelper.h	(revision 20678)
+++ ruby_1_9_1/vm_insnhelper.h	(revision 20679)
@@ -53,7 +53,7 @@
   BOP_NOT,
   BOP_NEQ,
 
-  BOP_LAST_,
+  BOP_LAST_
 };
 
 extern char ruby_vm_redefined_flag[BOP_LAST_];
Index: ruby_1_9_1/template/insns.inc.tmpl
===================================================================
--- ruby_1_9_1/template/insns.inc.tmpl	(revision 20678)
+++ ruby_1_9_1/template/insns.inc.tmpl	(revision 20679)
@@ -15,7 +15,6 @@
 
 enum ruby_vminsn_type {
 <%= insns %>
+  VM_INSTRUCTION_SIZE            = <%= @insns.size %>
 };
 
-#define VM_INSTRUCTION_SIZE <%= @insns.size %>
-

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