From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Sun, 24 Jun 2001 18:35:18 +0000 (+0000)
Subject: The #10771 didn't take?
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=513629ba5d0f3f020f7bd86ec9c6cee5df562933;p=p5sagit%2Fp5-mst-13.2.git

The #10771 didn't take?

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

diff --git a/pp_ctl.c b/pp_ctl.c
index 3bb8392..68db6bb 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -87,6 +87,34 @@ PP(pp_regcomp)
     STRLEN len;
     MAGIC *mg = Null(MAGIC*);
 
+Change 10771 by jhi@alpha on 2001/06/21 12:10:29
+
+        Subject: [PATCH] Make /o work under i?threads
+        From: Richard Soderberg <rs@crystalflame.net>
+        Date: Thu, 21 Jun 2001 05:21:43 -0700 (PDT)
+        Message-ID: <Pine.LNX.4.21.0106210518210.2479-100000@oregonnet.com>
+
+Affected files ...
+
+  ... //depot/perl/pp_ctl.c#267 edit
+
+Differences ...
+
+  ==== //depot/perl/pp_ctl.c#267 (text) ====
+Index: perl/pp_ctl.c
+--- perl/pp_ctl.c.~1~   Sun Jun 24 22:31:38 2001
++++ perl/pp_ctl.c       Sun Jun 24 22:31:38 2001
+@@ -88,6 +88,13 @@
+     MAGIC *mg = Null(MAGIC*);
+ 
+     tmpstr = POPs;
+
+     /* prevent recompiling under /o and ithreads. */
+#if defined(USE_ITHREADS) || defined(USE_THREADS)
+     if (pm->op_pmflags & PMf_KEEP && PM_GETRE(pm))
+	  RETURN;
+#endif
+
     tmpstr = POPs;
     if (SvROK(tmpstr)) {
 	SV *sv = SvRV(tmpstr);