From 0dee7247a734b15fb653ea31d9a7bb3f7d8a33cf Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 16 Aug 2011 09:56:56 +0000 Subject: * vm.c (ruby_threadptr_data_type): rename to hide. [ruby-core:38972] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32986 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ vm.c | 4 ++-- vm_core.h | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59971d8280..fb2fe6577e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Aug 16 18:56:54 2011 Nobuyoshi Nakada + + * vm.c (ruby_threadptr_data_type): rename to hide. + [ruby-core:38972] + Tue Aug 16 18:52:08 2011 Nobuyoshi Nakada * win32/mkexports.rb (Exports::Mswin#each_export): exclude Init_ diff --git a/vm.c b/vm.c index a057b6bb30..16d04db312 100644 --- a/vm.c +++ b/vm.c @@ -1786,8 +1786,8 @@ thread_memsize(const void *ptr) } } -#define thread_data_type ruby_thread_data_type -const rb_data_type_t ruby_thread_data_type = { +#define thread_data_type ruby_threadptr_data_type +const rb_data_type_t ruby_threadptr_data_type = { "VM/thread", { rb_thread_mark, diff --git a/vm_core.h b/vm_core.h index 21e7d866c5..66c3cda792 100644 --- a/vm_core.h +++ b/vm_core.h @@ -350,10 +350,10 @@ typedef struct rb_block_struct { VALUE proc; } rb_block_t; -extern const rb_data_type_t ruby_thread_data_type; +extern const rb_data_type_t ruby_threadptr_data_type; #define GetThreadPtr(obj, ptr) \ - TypedData_Get_Struct((obj), rb_thread_t, &ruby_thread_data_type, (ptr)) + TypedData_Get_Struct((obj), rb_thread_t, &ruby_threadptr_data_type, (ptr)) enum rb_thread_status { THREAD_TO_KILL, -- cgit v1.2.3