X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=fakethr.h;h=098fefea9ec93e88f323d6e94740151f05c2c851;hb=aa921f48035f298291146b3a8d6f142ec7cf8696;hp=eaab4b8ca7ffb5019af90530ebbe6bc3ed5b849c;hpb=ea0efc06fdad2019ffceb86d079dd853e9d79cea;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/fakethr.h b/fakethr.h
index eaab4b8..098fefe 100644
--- a/fakethr.h
+++ b/fakethr.h
@@ -1,12 +1,12 @@
 typedef int perl_mutex;
 typedef int perl_key;
 
-typedef struct thread *perl_thread;
+typedef struct perl_thread *perl_os_thread;
 /* With fake threads, thr is global(ish) so we don't need dTHR */
 #define dTHR extern int errno
 
 struct perl_wait_queue {
-    struct thread *		thread;
+    struct perl_thread *	thread;
     struct perl_wait_queue *	next;
 };
 typedef struct perl_wait_queue *perl_cond;
@@ -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 */
@@ -22,7 +22,7 @@ struct thread_intern {
 
 #define init_thread_intern(t) 				\
     STMT_START {					\
-	t->Tself = (t);					\
+	t->self = (t);					\
 	(t)->i.next_run = (t)->i.prev_run = (t);	\
 	(t)->i.wait_queue = 0;				\
 	(t)->i.private = 0;				\
@@ -34,7 +34,7 @@ struct thread_intern {
  * something a bit different for XS code.
  */
 
-#define SCHEDULE() return schedule(), op
+#define SCHEDULE() return schedule(), PL_op
 
 #define MUTEX_LOCK(m)
 #define MUTEX_UNLOCK(m)