aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-14 18:08:10 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-14 18:08:10 +0000
commit5e4e71a34852ccc8e871e384de19dccad347100c (patch)
tree76acd628eb4e40e1f3adadf2627c07bf233e515b
parenta8d47615da58b73423cf638f57b694d6ab463b9b (diff)
downloadruby-5e4e71a34852ccc8e871e384de19dccad347100c.tar.gz
* vm.(c|h), yarvcore.(c|h) (yarvGlobalStateVersion): rename to
ruby_vm_global_state_version. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11744 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--vm.c2
-rw-r--r--vm.h4
-rw-r--r--yarvcore.c3
-rw-r--r--yarvcore.h2
5 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index e2975c1b34..5365351f10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 15 01:52:53 2007 Koichi Sasada <ko1@atdot.net>
+
+ * vm.(c|h), yarvcore.(c|h) (yarvGlobalStateVersion): rename to
+ ruby_vm_global_state_version.
+
Thu Feb 15 01:50:26 2007 Koichi Sasada <ko1@atdot.net>
* test/fileutils/test_fileutils.rb (check_singleton): fix to use
diff --git a/vm.c b/vm.c
index a5779da7c4..24b27a3bf9 100644
--- a/vm.c
+++ b/vm.c
@@ -60,6 +60,8 @@ static VALUE yarv_finish_insn_seq[1] = { BIN(finish) };
#include "call_cfunc.ci"
+static VALUE vm_global_state_version = 1;
+
void
rb_vm_change_state(void)
{
diff --git a/vm.h b/vm.h
index 3f1f66b985..b9d52b41d4 100644
--- a/vm.h
+++ b/vm.h
@@ -264,9 +264,9 @@ default: \
/* VM state version */
-#define GET_VM_STATE_VERSION() (yarvGlobalStateVersion)
+#define GET_VM_STATE_VERSION() (vm_global_state_version)
#define INC_VM_STATE_VERSION() \
- (yarvGlobalStateVersion = (yarvGlobalStateVersion+1) & 0x8fffffff)
+ (vm_global_state_version = (vm_global_state_version+1) & 0x8fffffff)
#define BOP_PLUS 0x01
#define BOP_MINUS 0x02
diff --git a/yarvcore.c b/yarvcore.c
index ee0b02a3a9..dc0eb15e6d 100644
--- a/yarvcore.c
+++ b/yarvcore.c
@@ -58,9 +58,6 @@ ID id__send;
ID idFuncall;
ID id__send_bang;
-unsigned long yarvGlobalStateVersion = 1;
-
-
/* from Ruby 1.9 eval.c */
#ifdef HAVE_STDARG_PROTOTYPES
#include <stdarg.h>
diff --git a/yarvcore.h b/yarvcore.h
index 7e66f7ec20..209b53dafe 100644
--- a/yarvcore.h
+++ b/yarvcore.h
@@ -138,8 +138,6 @@ extern ID idFuncall;
extern ID id__send_bang;
-extern unsigned long yarvGlobalStateVersion;
-
struct insn_info_struct {
unsigned short position;
unsigned short line_no;