Re: [PATCH perl@10538] make ext/re play nice with DEBUGGING override

[p5sagit/p5-mst-13.2.git] / ext / re / re.xs

diff --git a/ext/re/re.xs b/ext/re/re.xs
index 04a5fdc..faab0b3 100644 (file)
--- a/ext/re/re.xs
+++ b/ext/re/re.xs
@@ -1,13 +1,12 @@
-/* We need access to debugger hooks */
-#ifndef DEBUGGING
-#  define DEBUGGING
-#endif
-
 #define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
 
+#ifdef WAS_NOT_DEBUGGING
+void Perl_deb(pTHX_ const char* pat, ...) { }
+#endif
+
 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,
@@ -20,12 +19,9 @@ extern SV*   my_re_intuit_string (pTHX_ regexp *prog);
 
 static int oldfl;
 
-#define R_DB 512
-
 static void
 deinstall(pTHX)
 {
-    dTHR;
     PL_regexecp = Perl_regexec_flags;
     PL_regcompp = Perl_pregcomp;
     PL_regint_start = Perl_re_intuit_start;
@@ -33,21 +29,20 @@ deinstall(pTHX)
     PL_regfree = Perl_pregfree;
 
     if (!oldfl)
-       PL_debug &= ~R_DB;
+       PL_debug &= ~DEBUG_r_FLAG;
 }
 
 static void
 install(pTHX)
 {
-    dTHR;
     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;
+    oldfl = PL_debug & DEBUG_r_FLAG;
+    PL_debug |= DEBUG_r_FLAG;
 }
 
 MODULE = re    PACKAGE = re