X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2Fre%2Fre.xs;h=04a5fdc7420e6a0b73b5b45c3abbc74f5e8edda9;hb=472390e15c17c4c1655b51bde3088514660cf301;hp=5e68226235a7287a4d4a4fbfab182649b8889578;hpb=b9d5759e179510f18c95c0d3686ffa808dca661e;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/re/re.xs b/ext/re/re.xs
index 5e68226..04a5fdc 100644
--- a/ext/re/re.xs
+++ b/ext/re/re.xs
@@ -3,43 +3,61 @@
 #  define DEBUGGING
 #endif
 
+#define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
 
-extern regexp*	my_regcomp _((char* exp, char* xend, PMOP* pm));
-extern I32	my_regexec _((regexp* prog, char* stringarg, char* strend,
-			      char* strbeg, I32 minend, SV* screamer,
-			      void* data, U32 flags));
+extern regexp*	my_regcomp (pTHX_ char* exp, char* xend, PMOP* pm);
+extern I32	my_regexec (pTHX_ regexp* prog, char* stringarg, char* strend,
+			    char* strbeg, I32 minend, SV* screamer,
+			    void* data, U32 flags);
+extern void	my_regfree (pTHX_ struct regexp* r);
+extern char*	my_re_intuit_start (pTHX_ regexp *prog, SV *sv, char *strpos,
+				    char *strend, U32 flags,
+				    struct re_scream_pos_data_s *data);
+extern SV*	my_re_intuit_string (pTHX_ regexp *prog);
 
 static int oldfl;
 
 #define R_DB 512
 
 static void
-deinstall(void)
+deinstall(pTHX)
 {
     dTHR;
-    regexecp = &regexec_flags;
-    regcompp = &pregcomp;
+    PL_regexecp = Perl_regexec_flags;
+    PL_regcompp = Perl_pregcomp;
+    PL_regint_start = Perl_re_intuit_start;
+    PL_regint_string = Perl_re_intuit_string;
+    PL_regfree = Perl_pregfree;
+
     if (!oldfl)
-	debug &= ~R_DB;
+	PL_debug &= ~R_DB;
 }
 
 static void
-install(void)
+install(pTHX)
 {
     dTHR;
-    regexecp = &my_regexec;
-    regcompp = &my_regcomp;
-    oldfl = debug & R_DB;
-    debug |= R_DB;
+    PL_colorset = 0;			/* Allow reinspection of ENV. */
+    PL_regexecp = &my_regexec;
+    PL_regcompp = &my_regcomp;
+    PL_regint_start = &my_re_intuit_start;
+    PL_regint_string = &my_re_intuit_string;
+    PL_regfree = &my_regfree;
+    oldfl = PL_debug & R_DB;
+    PL_debug |= R_DB;
 }
 
 MODULE = re	PACKAGE = re
 
 void
 install()
+  CODE:
+    install(aTHX);
 
 void
 deinstall()
+  CODE:
+    deinstall(aTHX);