Reverse integrate Malcolm's chanes into local

repository, then import result back into my view
of Malcolm's repository.
Builds and passes (most) tests with GNU C++/Solaris
and Borland C++, Win32.

p4raw-id: //depot/ansiperl@210

1 files changed, 8 insertions, 10 deletions

diff --git a/pp_sys.c b/pp_sys.c
index 9a96f7a9d3..34a175ae03 100644
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -284,11 +284,10 @@ PP(pp_warn)
 	tmps = SvPV(TOPs, na);
     }
     if (!tmps || !*tmps) {
-	SV *error = GvSV(errgv);
-	(void)SvUPGRADE(error, SVt_PV);
-	if (SvPOK(error) && SvCUR(error))
-	    sv_catpv(error, "\t...caught");
-	tmps = SvPV(error, na);
+	(void)SvUPGRADE(errsv, SVt_PV);
+	if (SvPOK(errsv) && SvCUR(errsv))
+	    sv_catpv(errsv, "\t...caught");
+	tmps = SvPV(errsv, na);
     }
     if (!tmps || !*tmps)
 	tmps = "Warning: something's wrong";
@@ -310,11 +309,10 @@ PP(pp_die)
 	tmps = SvPV(TOPs, na);
     }
     if (!tmps || !*tmps) {
-	SV *error = GvSV(errgv);
-	(void)SvUPGRADE(error, SVt_PV);
-	if (SvPOK(error) && SvCUR(error))
-	    sv_catpv(error, "\t...propagated");
-	tmps = SvPV(error, na);
+	(void)SvUPGRADE(errsv, SVt_PV);
+	if (SvPOK(errsv) && SvCUR(errsv))
+	    sv_catpv(errsv, "\t...propagated");
+	tmps = SvPV(errsv, na);
     }
     if (!tmps || !*tmps)
 	tmps = "Died";