[inseparable changes from match from perl-5.003_97 to perl-5.003_97a]

 CORE PORTABILITY

Subject: Add support for Cygwin32 (GNU-Win32) -- very low impact
Date: Thu, 3 Apr 1997 09:21:17 +0100
From: John Cerney <j-cerney1@ti.com>
Files: MANIFEST README.cygwin32 cygwin32/cw32imp.h cygwin32/gcc2 cygwin32/ld2 cygwin32/perlgcc cygwin32/perlld ext/DynaLoader/dl_cygwin32.xs hints/cygwin32.sh perl.h pp_sys.c
Msg-ID: 199704030821.JAA08762@pluto.tiuk.ti.com

    (applied based on p5p patch as commit 2a079e0090406b1b2e50643540f149206c9e9de8)

Subject: Win32 update (six patches)
From: Gurusamy Sarathy <gsar@engin.umich.edu>
Files: MANIFEST README.win32 dosish.h t/io/fs.t t/io/tell.t t/lib/io_tell.t t/op/magic.t t/op/mkdir.t t/op/runlevel.t t/op/stat.t t/op/taint.t win32/Makefile win32/VC-2.0/pod.mak win32/makedef.pl win32/pod.mak win32/win32.c win32/win32.h win32/win32io.c win32/win32io.h win32/win32iop.h

 LIBRARY AND EXTENSIONS

Subject: Math::Trig, based on (and from an author of) Math::Complex
From: Chip Salzenberg <chip@perl.com>
Files: MANIFEST lib/Math/Complex.pm lib/Math/Trig.pm pod/perldelta.pod t/lib/complex.t t/lib/trig.t

 OTHER CORE CHANGES

Subject: Fix const-sub-related panic on C<sub foo { my $x; 0 } foo>
From: Chip Salzenberg <chip@perl.com>
Files: op.c

Subject: Fix warning for useless C<1..2>
From: Chip Salzenberg <chip@perl.com>
Files: op.c

Subject: Minor cleanups
Date: Thu, 03 Apr 1997 19:56:57 -0500
From: Gurusamy Sarathy <gsar@engin.umich.edu>
Files: mg.c mg.h perl.c
Msg-ID: 199704040056.TAA22253@aatma.engin.umich.edu

    (applied based on p5p patch as commit 609794497049cf42bdd2396c04cbb7728e10374d)

Subject: Eliminate unreliable warning with %SIG and strict refs
From: Chip Salzenberg <chip@perl.com>
Files: mg.c

Subject: Fix impossible test in vivification
From: Chip Salzenberg <chip@perl.com>
Files: mg.c

1 files changed, 9 insertions, 12 deletions

diff --git a/op.c b/op.c
index 34b1d3c3a0..ef2940a01c 100644
--- a/op.c
+++ b/op.c
@@ -811,17 +811,13 @@ OP *op;
 	for (kid = cUNOP->op_first->op_sibling; kid; kid = kid->op_sibling)
 	    scalarvoid(kid);
 	break;
+
     case OP_NULL:
 	if (op->op_targ == OP_NEXTSTATE || op->op_targ == OP_DBSTATE)
 	    curcop = ((COP*)op);		/* for warning below */
 	if (op->op_flags & OPf_STACKED)
 	    break;
-
-    case OP_REQUIRE:
-	/* since all requires must return a value, they're never void */
-	op->op_flags &= ~OPf_WANT;
-	return scalar(op);
-
+	/* FALL THROUGH */
     case OP_ENTERTRY:
     case OP_ENTER:
     case OP_SCALAR:
@@ -837,6 +833,10 @@ OP *op;
 	for (kid = cLISTOP->op_first; kid; kid = kid->op_sibling)
 	    scalarvoid(kid);
 	break;
+    case OP_REQUIRE:
+	/* since all requires must return a value, they're never void */
+	op->op_flags &= ~OPf_WANT;
+	return scalar(op);
     case OP_SPLIT:
 	if ((kid = ((LISTOP*)op)->op_first) && kid->op_type == OP_PUSHRE) {
 	    if (!kPMOP->op_pmreplroot)
@@ -3185,17 +3185,14 @@ CV* cv;
 	else if (type == OP_PADSV) {
 	    AV* pad = (AV*)(AvARRAY(CvPADLIST(cv))[1]);
 	    sv = pad ? AvARRAY(pad)[o->op_targ] : Nullsv;
-	    if (!sv)
+	    if (!sv || (!SvREADONLY(sv) && SvREFCNT(sv) > 1))
 		return Nullsv;
-	    if (!SvREADONLY(sv)) {
-		if (SvREFCNT(sv) > 1)
-		    return Nullsv;
-		SvREADONLY_on(sv);
-	    }
 	}
 	else
 	    return Nullsv;
     }
+    if (sv)
+	SvREADONLY_on(sv);
     return sv;
 }