use more 'const' in the Encode data structures.

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

diff --git a/ext/re/re.xs b/ext/re/re.xs
index cc4dc69..11239d7 100644 (file)
--- a/ext/re/re.xs
+++ b/ext/re/re.xs
@@ -1,7 +1,5 @@
-/* We need access to debugger hooks */
-#ifndef DEBUGGING
+#if defined(PERL_EXT_RE_DEBUG) && !defined(DEBUGGING)
 #  define DEBUGGING
-#  define WAS_NOT_DEBUGGING
 #endif
 
 #define PERL_NO_GET_CONTEXT
@@ -9,9 +7,7 @@
 #include "perl.h"
 #include "XSUB.h"
 
-#ifdef WAS_NOT_DEBUGGING
-void Perl_deb(pTHX_ const char* pat, ...) { }
-#endif
+START_EXTERN_C
 
 extern regexp* my_regcomp (pTHX_ char* exp, char* xend, PMOP* pm);
 extern I32     my_regexec (pTHX_ regexp* prog, char* stringarg, char* strend,
@@ -23,42 +19,60 @@ extern char*        my_re_intuit_start (pTHX_ regexp *prog, SV *sv, char *strpos,
                                    struct re_scream_pos_data_s *data);
 extern SV*     my_re_intuit_string (pTHX_ regexp *prog);
 
-static int oldfl;
+END_EXTERN_C
+
+#define MY_CXT_KEY "re::_guts" XS_VERSION
+
+typedef struct {
+    int                x_oldflag;              /* debug flag */
+} my_cxt_t;
+
+START_MY_CXT
+
+#define oldflag                (MY_CXT.x_oldflag)
 
 static void
-deinstall(pTHX)
+uninstall(pTHX)
 {
+    dMY_CXT;
     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)
+    if (!oldflag)
        PL_debug &= ~DEBUG_r_FLAG;
 }
 
 static void
 install(pTHX)
 {
+    dMY_CXT;
     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 & DEBUG_r_FLAG;
+    oldflag = PL_debug & DEBUG_r_FLAG;
     PL_debug |= DEBUG_r_FLAG;
 }
 
 MODULE = re    PACKAGE = re
 
+BOOT:
+{
+   MY_CXT_INIT;
+}
+
+
 void
 install()
   CODE:
     install(aTHX);
 
 void
-deinstall()
+uninstall()
   CODE:
-    deinstall(aTHX);
+    uninstall(aTHX);