From fe867f47ac42604cbbefddeae18c88ceab223235 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 9 Dec 2008 04:25:54 +0000
Subject: [PATCH] * cont.c (fiber_status), template/insns.inc.tmpl
 (ruby_vminsn_type),   vm_insnhelper.h (BOP): ISO C forbids comma at end of
 enumerator   list.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20591 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog               | 6 +++++-
 cont.c                  | 2 +-
 template/insns.inc.tmpl | 3 +--
 vm_insnhelper.h         | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6e2f8baf53..6c375199fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-Tue Dec  9 13:23:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Dec  9 13:25:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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.
 
diff --git a/cont.c b/cont.c
index 0f805881dc..10912e4c35 100644
--- a/cont.c
+++ b/cont.c
@@ -47,7 +47,7 @@ typedef struct rb_context_struct {
 enum fiber_status {
     CREATED,
     RUNNING,
-    TERMINATED,
+    TERMINATED
 };
 
 typedef struct rb_fiber_struct {
diff --git a/template/insns.inc.tmpl b/template/insns.inc.tmpl
index 97c20ef9ad..a64b39ccd2 100644
--- a/template/insns.inc.tmpl
+++ b/template/insns.inc.tmpl
@@ -15,7 +15,6 @@
 
 enum ruby_vminsn_type {
 <%= insns %>
+  VM_INSTRUCTION_SIZE            = <%= @insns.size %>
 };
 
-#define VM_INSTRUCTION_SIZE <%= @insns.size %>
-
diff --git a/vm_insnhelper.h b/vm_insnhelper.h
index 83efeda4ba..613d997a4c 100644
--- a/vm_insnhelper.h
+++ b/vm_insnhelper.h
@@ -53,7 +53,7 @@ enum {
   BOP_NOT,
   BOP_NEQ,
 
-  BOP_LAST_,
+  BOP_LAST_
 };
 
 extern char ruby_vm_redefined_flag[BOP_LAST_];