From: Malcolm Beattie <mbeattie@sable.ox.ac.uk>
Date: Thu, 16 Oct 1997 14:01:11 +0000 (+0000)
Subject: Fix up merge with 5.004_04.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1f2bfc8a4408af651fa6e1f274db91de216cc5d4;p=p5sagit%2Fp5-mst-13.2.git

Fix up merge with 5.004_04.

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

diff --git a/op.c b/op.c
index 7c769d1..680b825 100644
--- a/op.c
+++ b/op.c
@@ -4237,8 +4237,8 @@ OP *o;
 {
     GV *gv;
 
-    if ((op->op_flags & OPf_KIDS) && !cLISTOP->op_first->op_sibling)
-	append_elem(OP_GLOB, op, newSVREF(newGVOP(OP_GV, 0, defgv)));
+    if ((o->op_flags & OPf_KIDS) && !cLISTOPo->op_first->op_sibling)
+	append_elem(OP_GLOB, o, newSVREF(newGVOP(OP_GV, 0, defgv)));
 
     if (!((gv = gv_fetchpv("glob", FALSE, SVt_PVCV)) && GvIMPORTED_CV(gv)))
 	gv = gv_fetchpv("CORE::GLOBAL::glob", FALSE, SVt_PVCV);
@@ -4248,6 +4248,14 @@ OP *o;
 
 	append_elem(OP_GLOB, o,
 		    newSVOP(OP_CONST, 0, newSViv(glob_index++)));
+	o->op_type = OP_LIST;
+	o->op_ppaddr = ppaddr[OP_LIST];
+	cLISTOPo->op_first->op_type = OP_PUSHMARK;
+	cLISTOPo->op_first->op_ppaddr = ppaddr[OP_PUSHMARK];
+	o = newUNOP(OP_ENTERSUB, OPf_STACKED,
+		    append_elem(OP_LIST, o, 
+				scalar(newUNOP(OP_RV2CV, 0,
+					       newGVOP(OP_GV, 0, gv)))));
 	o = newUNOP(OP_NULL, 0, ck_subr(o));
 	o->op_targ = OP_GLOB;		/* hint at what it used to be */
 	return o;
diff --git a/perl.c b/perl.c
index 16e74b8..3e592fd 100644
--- a/perl.c
+++ b/perl.c
@@ -232,7 +232,9 @@ register PerlInterpreter *sv_interp;
     int destruct_level;  /* 0=none, 1=full, 2=full with checks */
     I32 last_sv_count;
     HV *hv;
+#ifdef USE_THREADS
     Thread t;
+#endif /* USE_THREADS */
 
     if (!(curinterp = sv_interp))
 	return;
diff --git a/t/lib/dosglob.t b/t/lib/dosglob.t
old mode 100644
new mode 100755