3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 508f09f7fe..00b816a09b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 16 18:56:54 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (ruby_threadptr_data_type): rename to hide.
+	  [ruby-core:38972]
+
 Tue Aug 16 18:52:08 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/mkexports.rb (Exports::Mswin#each_export): exclude Init_
diff --git a/vm.c b/vm.c
index c627a91bcf..3147ae4c73 100644
--- a/vm.c
+++ b/vm.c
@@ -1792,8 +1792,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 b5433f9094..1cb7788439 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,