summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Dougherty <doughera@lafayette.edu>1998-07-13 12:50:55 -0400
committerGurusamy Sarathy <gsar@cpan.org>1998-07-14 04:23:28 +0000
commitb9d5759e179510f18c95c0d3686ffa808dca661e (patch)
tree43c035a298cf3ae1f39091231d0f816a631fe238
parent87563a30286604e7bcb7c822d9a91466c80e6504 (diff)
downloadperl-b9d5759e179510f18c95c0d3686ffa808dca661e.tar.gz
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
-rw-r--r--ext/re/Makefile.PL2
-rw-r--r--ext/re/re.xs5
-rw-r--r--regcomp.c15
-rw-r--r--regexec.c13
4 files changed, 31 insertions, 4 deletions
diff --git a/ext/re/Makefile.PL b/ext/re/Makefile.PL
index 8350f2f861..e21b923b29 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 2d0f18700a..5e68226235 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 ba67264432..01f84a98cb 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 314fc3dc6a..c1cd8db2b3 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