* thread_pthread.h, thread_win32.h: rename rb_thread_id_t to

  rb_nativethread_id_t.
* thread_pthread.c, vm_core.h: use rb_nativethread_id_t.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42136 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 12 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 981cfd38e1..611199bc97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jul 23 19:34:11 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.h, thread_win32.h: rename rb_thread_id_t to
+	  rb_nativethread_id_t.
+
+	* thread_pthread.c, vm_core.h: use rb_nativethread_id_t.
+
 Tue Jul 23 18:56:11 2013  Koichi Sasada  <ko1@atdot.net>
 
 	* ext/openssl/ossl.c: use system native (system provided)
diff --git a/thread_pthread.c b/thread_pthread.c
index 378dede9ea..e13e26786e 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -572,7 +572,7 @@ get_stack(void **addr, size_t *size)
 #endif
 
 static struct {
-    rb_thread_id_t id;
+    rb_nativethread_id_t id;
     size_t stack_maxsize;
     VALUE *stack_start;
 #ifdef __ia64
@@ -694,7 +694,7 @@ ruby_init_stack(volatile VALUE *addr
 static int
 native_thread_init_stack(rb_thread_t *th)
 {
-    rb_thread_id_t curr = pthread_self();
+    rb_nativethread_id_t curr = pthread_self();
 
     if (pthread_equal(curr, native_main_thread.id)) {
 	th->machine_stack_start = native_main_thread.stack_start;
diff --git a/thread_pthread.h b/thread_pthread.h
index a02c3674ab..0486c11381 100644
--- a/thread_pthread.h
+++ b/thread_pthread.h
@@ -15,7 +15,7 @@
 #ifdef HAVE_PTHREAD_NP_H
 #include <pthread_np.h>
 #endif
-typedef pthread_t rb_thread_id_t;
+typedef pthread_t rb_nativethread_id_t;
 typedef pthread_mutex_t rb_nativethread_lock_t;
 
 typedef struct rb_thread_cond_struct {
diff --git a/thread_win32.h b/thread_win32.h
index 63e0713bdc..4febe15a96 100644
--- a/thread_win32.h
+++ b/thread_win32.h
@@ -21,7 +21,7 @@
 WINBASEAPI BOOL WINAPI
 TryEnterCriticalSection(IN OUT LPCRITICAL_SECTION lpCriticalSection);
 
-typedef HANDLE rb_thread_id_t;
+typedef HANDLE rb_nativethread_id_t;
 
 typedef union rb_thread_lock_union {
     HANDLE mutex;
diff --git a/vm_core.h b/vm_core.h
index 0227339231..fad9aab1e0 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -526,7 +526,7 @@ typedef struct rb_thread_struct {
     VALUE root_svar;
 
     /* thread control */
-    rb_thread_id_t thread_id;
+    rb_nativethread_id_t thread_id;
     enum rb_thread_status status;
     int to_kill;
     int priority;