From 24d4ba2a258d2cbbc8cd2a75496d5aae5f13d6b7 Mon Sep 17 00:00:00 2001 From: ko1 Date: Wed, 14 Feb 2007 18:08:10 +0000 Subject: * vm.(c|h), yarvcore.(c|h) (yarvGlobalStateVersion): rename to ruby_vm_global_state_version. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11744 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ vm.c | 2 ++ vm.h | 4 ++-- yarvcore.c | 3 --- yarvcore.h | 2 -- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2975c1b3..5365351f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 15 01:52:53 2007 Koichi Sasada + + * vm.(c|h), yarvcore.(c|h) (yarvGlobalStateVersion): rename to + ruby_vm_global_state_version. + Thu Feb 15 01:50:26 2007 Koichi Sasada * test/fileutils/test_fileutils.rb (check_singleton): fix to use diff --git a/vm.c b/vm.c index a5779da7c..24b27a3bf 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 3f1f66b98..b9d52b41d 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 ee0b02a3a..dc0eb15e6 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 diff --git a/yarvcore.h b/yarvcore.h index 7e66f7ec2..209b53daf 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; -- cgit