From: Gurusamy Sarathy <gsar@cpan.org>
Date: Mon, 22 Jun 1998 04:06:02 +0000 (+0000)
Subject: backout change#1178 as it was dependent on an unapplied patch,
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=3149a8e4470730775216b8a4cb7dafbaae9f0572;p=p5sagit%2Fp5-mst-13.2.git

backout change#1178 as it was dependent on an unapplied patch,
fix filespec.t to know its @INC

p4raw-link: @1178 on //depot/perl: a21df721bd2b1f6f6000b965978d9b9377c04298

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

diff --git a/sv.c b/sv.c
index ee5d34f..245c4a5 100644
--- a/sv.c
+++ b/sv.c
@@ -1702,7 +1702,7 @@ sv_2pv(register SV *sv, STRLEN *lp)
 		case SVt_PVMG:
 		    if ( ((SvFLAGS(sv) &
 			   (SVs_OBJECT|SVf_OK|SVs_GMG|SVs_SMG|SVs_RMG)) 
-			  == (SVs_OBJECT|SVs_RMG|SVs_SMG))
+			  == (SVs_OBJECT|SVs_RMG))
 			 && strEQ(s=HvNAME(SvSTASH(sv)), "Regexp")
 			 && (mg = mg_find(sv, 'r'))) {
 			regexp *re = (regexp *)mg->mg_obj;
diff --git a/t/lib/filespec.t b/t/lib/filespec.t
index 8ba4363..ca22d3e 100755
--- a/t/lib/filespec.t
+++ b/t/lib/filespec.t
@@ -1,11 +1,13 @@
-#!/usr/bin/perl
-
-print "1..4\n";
+#!./perl
 
 BEGIN {
-	$^O = '';
+    $^O = '';
+    chdir 't' if -d 't';
+    @INC = '../lib';
 }
 
+print "1..4\n";
+
 use File::Spec;