From: Malcolm Beattie <mbeattie@sable.ox.ac.uk>
Date: Wed, 10 Sep 1997 13:56:50 +0000 (+0000)
Subject: Solaris fixes: delete pad and padname from thread.h and remove
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5538b5808b062cabb0bf41698c02c8011317900e;p=p5sagit%2Fp5-mst-13.2.git

Solaris fixes: delete pad and padname from thread.h and remove
MUTEX_* stuff when malloc.c gets copied to x2p/malloc.c.

p4raw-id: //depot/perl@61
---

diff --git a/thread.h b/thread.h
index 655851d..06d5d89 100644
--- a/thread.h
+++ b/thread.h
@@ -126,8 +126,6 @@ struct thread {
     /* XXX What about magic variables such as $/, $? and so on? */
     HV *	Tdefstash;
     HV *	Tcurstash;
-    AV *	Tpad;
-    AV *	Tpadname;
 
     SV **	Ttmps_stack;
     I32		Ttmps_ix;
@@ -263,8 +261,6 @@ typedef struct condpair {
 #define Xpv		(thr->TXpv)
 #define defstash	(thr->Tdefstash)
 #define curstash	(thr->Tcurstash)
-#define pad		(thr->Tpad)
-#define padname		(thr->Tpadname)
 
 #define tmps_stack	(thr->Ttmps_stack)
 #define tmps_ix		(thr->Ttmps_ix)
diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index 0ca3ff3..0c9dfca 100755
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -153,7 +153,8 @@ malloc.c: ../malloc.c
 	sed <../malloc.c >malloc.c \
 	    -e 's/"EXTERN.h"/"..\/EXTERN.h"/' \
 	    -e 's/"perl.h"/"..\/perl.h"/' \
-	    -e 's/my_exit/exit/'
+	    -e 's/my_exit/exit/' \
+	    -e 's/MUTEX_[A-Z_]*(&malloc_mutex);//'
 
 # AUTOMATICALLY GENERATED MAKE DEPENDENCIES--PUT NOTHING BELOW THIS LINE
 $(obj):