4 files changed, 7 insertions, 7 deletions

diff --git a/fakethr.h b/fakethr.h
index e09a757b6d..596e8a9e3e 100644
--- a/fakethr.h
+++ b/fakethr.h
@@ -1,7 +1,7 @@
 typedef int perl_mutex;
 typedef int perl_key;
 
-typedef struct thread *perl_thread;
+typedef struct thread *perl_os_thread;
 /* With fake threads, thr is global(ish) so we don't need dTHR */
 #define dTHR extern int errno
 
@@ -14,7 +14,7 @@ typedef struct perl_wait_queue *perl_cond;
 /* Ask thread.h to include our per-thread extras */
 #define HAVE_THREAD_INTERN
 struct thread_intern {
-    perl_thread next_run, prev_run;     /* Linked list of runnable threads */
+    perl_os_thread next_run, prev_run;  /* Linked list of runnable threads */
     perl_cond   wait_queue;             /* Wait queue that we are waiting on */
     IV          private;                /* Holds data across time slices */
     I32         savemark;               /* Holds MARK for thread join values */
diff --git a/thread.h b/thread.h
index 79059db8fc..5c78e7d2a2 100644
--- a/thread.h
+++ b/thread.h
@@ -5,7 +5,7 @@
 #else
 
 /* POSIXish threads */
-typedef pthread_t perl_thread;
+typedef pthread_t perl_os_thread;
 #ifdef OLD_PTHREADS_API
 #  define pthread_mutexattr_init(a) pthread_mutexattr_create(a)
 #  define pthread_mutexattr_settype(a,t) pthread_mutexattr_setkind_np(a,t)
@@ -216,7 +216,7 @@ struct thread {
 
     SV *	oursv;
     HV *	cvcache;
-    perl_thread	self;			/* Underlying thread object */
+    perl_os_thread	self;		/* Underlying thread object */
     U32		flags;
     AV *	threadsv;		/* Per-thread SVs ($_, $@ etc.) */
     AV *	specific;		/* Thread-specific user data */
diff --git a/util.c b/util.c
index e771cbc28d..9bdea38d2e 100644
--- a/util.c
+++ b/util.c
@@ -2322,7 +2322,7 @@ void
 perl_cond_signal(cp)
 perl_cond *cp;
 {
-    perl_thread t;
+    perl_os_thread t;
     perl_cond cond = *cp;
     
     if (!cond)
@@ -2343,7 +2343,7 @@ void
 perl_cond_broadcast(cp)
 perl_cond *cp;
 {
-    perl_thread t;
+    perl_os_thread t;
     perl_cond cond, cond_next;
     
     for (cond = *cp; cond; cond = cond_next) {
diff --git a/win32/win32thread.h b/win32/win32thread.h
index 0c6bb55b69..76392cff77 100644
--- a/win32/win32thread.h
+++ b/win32/win32thread.h
@@ -2,7 +2,7 @@
 #define _WIN32THREAD_H
 typedef struct win32_cond { LONG waiters; HANDLE sem; } perl_cond;
 typedef DWORD perl_key;
-typedef HANDLE perl_thread;
+typedef HANDLE perl_os_thread;
 
 #ifndef DONT_USE_CRITICAL_SECTION