From: Andy Dougherty <doughera@lafayette.edu>
Date: Mon, 13 Jul 1998 16:50:55 +0000 (-0400)
Subject: added suggested patch (via PM), tweaked to implicitly specify -DDEBUGGING
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b9d5759e179510f18c95c0d3686ffa808dca661e;p=p5sagit%2Fp5-mst-13.2.git

added suggested patch (via PM), tweaked to implicitly specify -DDEBUGGING
	Message-Id: <Pine.SUN.3.96.980713164922.28314B-100000@newton.phys>
	Subject: Re: _70 and Devel::RE

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

diff --git a/ext/re/Makefile.PL b/ext/re/Makefile.PL
index 8350f2f..e21b923 100644
--- a/ext/re/Makefile.PL
+++ b/ext/re/Makefile.PL
@@ -5,7 +5,7 @@ WriteMakefile(
     MAN3PODS		=> ' ', 	# Pods will be built by installman.
     XSPROTOARG		=> '-noprototypes',
     OBJECT		=> 're_exec$(OBJ_EXT) re_comp$(OBJ_EXT) re$(OBJ_EXT)',
-    DEFINE		=> '-DDEBUGGING -DIN_XSUB_RE',
+    DEFINE		=> '-DPERL_EXT_RE_BUILD',
     clean		=> { FILES => '*$(OBJ_EXT) *.c ../../lib/re.pm' },
 );
 
diff --git a/ext/re/re.xs b/ext/re/re.xs
index 2d0f187..5e68226 100644
--- a/ext/re/re.xs
+++ b/ext/re/re.xs
@@ -1,3 +1,8 @@
+/* We need access to debugger hooks */
+#ifndef DEBUGGING
+#  define DEBUGGING
+#endif
+
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
diff --git a/regcomp.c b/regcomp.c
index ba67264..01f84a9 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -19,7 +19,18 @@
  * with the POSIX routines of the same names.
 */
 
-#ifdef IN_XSUB_RE
+#ifdef PERL_EXT_RE_BUILD
+/* need to replace pregcomp et al, so enable that */
+#  ifndef PERL_IN_XSUB_RE
+#    define PERL_IN_XSUB_RE
+#  endif
+/* need access to debugger hooks */
+#  ifndef DEBUGGING
+#    define DEBUGGING
+#  endif
+#endif
+
+#ifdef PERL_IN_XSUB_RE
 /* We *really* need to overwrite these symbols: */
 #  define Perl_pregcomp my_regcomp
 #  define Perl_regdump my_regdump
@@ -66,7 +77,7 @@
 #include "EXTERN.h"
 #include "perl.h"
 
-#ifndef IN_XSUB_RE
+#ifndef PERL_IN_XSUB_RE
 #  include "INTERN.h"
 #endif
 
diff --git a/regexec.c b/regexec.c
index 314fc3d..c1cd8db 100644
--- a/regexec.c
+++ b/regexec.c
@@ -19,7 +19,18 @@
  * with the POSIX routines of the same names.
 */
 
-#ifdef IN_XSUB_RE
+#ifdef PERL_EXT_RE_BUILD
+/* need to replace pregcomp et al, so enable that */
+#  ifndef PERL_IN_XSUB_RE
+#    define PERL_IN_XSUB_RE
+#  endif
+/* need access to debugger hooks */
+#  ifndef DEBUGGING
+#    define DEBUGGING
+#  endif
+#endif
+
+#ifdef PERL_IN_XSUB_RE
 /* We *really* need to overwrite these symbols: */
 #  define Perl_regexec_flags my_regexec
 #  define Perl_regdump my_regdump