From: Vincent Pit <vince@profvince.com>
Date: Wed, 3 Jun 2015 08:38:00 +0000 (+0200)
Subject: Define PERL_IN_XSUB_RE when including perl.h
X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Fre-engine-Hooks.git;a=commitdiff_plain;h=db28a7ef5e55803a8c143a0ff4ddd9aca56438d7

Define PERL_IN_XSUB_RE when including perl.h

This is required since 780fcc9f has put some regexp-related macros in
perl.h.
---

diff --git a/src/5010001/regcomp.c b/src/5010001/regcomp.c
index 7d8fd6a..8565dc9 100644
--- a/src/5010001/regcomp.c
+++ b/src/5010001/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5010001/regexec.c b/src/5010001/regexec.c
index 8eda6c8..872ff24 100644
--- a/src/5010001/regexec.c
+++ b/src/5010001/regexec.c
@@ -72,8 +72,11 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5012000/regcomp.c b/src/5012000/regcomp.c
index 5f37b4c..3540e2e 100644
--- a/src/5012000/regcomp.c
+++ b/src/5012000/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5012000/regexec.c b/src/5012000/regexec.c
index 2493ffa..798df58 100644
--- a/src/5012000/regexec.c
+++ b/src/5012000/regexec.c
@@ -72,8 +72,11 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5012001/regcomp.c b/src/5012001/regcomp.c
index 7e48f91..6f31c1e 100644
--- a/src/5012001/regcomp.c
+++ b/src/5012001/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5012001/regexec.c b/src/5012001/regexec.c
index 2493ffa..798df58 100644
--- a/src/5012001/regexec.c
+++ b/src/5012001/regexec.c
@@ -72,8 +72,11 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5012002/regcomp.c b/src/5012002/regcomp.c
index 7e48f91..6f31c1e 100644
--- a/src/5012002/regcomp.c
+++ b/src/5012002/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5012002/regexec.c b/src/5012002/regexec.c
index e2665f2..8a6b9cc 100644
--- a/src/5012002/regexec.c
+++ b/src/5012002/regexec.c
@@ -72,8 +72,11 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5012003/regcomp.c b/src/5012003/regcomp.c
index 7e48f91..6f31c1e 100644
--- a/src/5012003/regcomp.c
+++ b/src/5012003/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5012003/regexec.c b/src/5012003/regexec.c
index e2665f2..8a6b9cc 100644
--- a/src/5012003/regexec.c
+++ b/src/5012003/regexec.c
@@ -72,8 +72,11 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5012004/regcomp.c b/src/5012004/regcomp.c
index 7e48f91..6f31c1e 100644
--- a/src/5012004/regcomp.c
+++ b/src/5012004/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5012004/regexec.c b/src/5012004/regexec.c
index e2665f2..8a6b9cc 100644
--- a/src/5012004/regexec.c
+++ b/src/5012004/regexec.c
@@ -72,8 +72,11 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5012005/regcomp.c b/src/5012005/regcomp.c
index 7e48f91..6f31c1e 100644
--- a/src/5012005/regcomp.c
+++ b/src/5012005/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5012005/regexec.c b/src/5012005/regexec.c
index e2665f2..8a6b9cc 100644
--- a/src/5012005/regexec.c
+++ b/src/5012005/regexec.c
@@ -72,8 +72,11 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5014000/regcomp.c b/src/5014000/regcomp.c
index aa5fc92..f26de1b 100644
--- a/src/5014000/regcomp.c
+++ b/src/5014000/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5014000/regexec.c b/src/5014000/regexec.c
index 90bea9d..2ce4da3 100644
--- a/src/5014000/regexec.c
+++ b/src/5014000/regexec.c
@@ -72,8 +72,11 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5014001/regcomp.c b/src/5014001/regcomp.c
index a933636..92372ce 100644
--- a/src/5014001/regcomp.c
+++ b/src/5014001/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5014001/regexec.c b/src/5014001/regexec.c
index b9d70dc..779bdf0 100644
--- a/src/5014001/regexec.c
+++ b/src/5014001/regexec.c
@@ -72,8 +72,11 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5014002/regcomp.c b/src/5014002/regcomp.c
index a933636..92372ce 100644
--- a/src/5014002/regcomp.c
+++ b/src/5014002/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5014002/regexec.c b/src/5014002/regexec.c
index 486b759..6b259b3 100644
--- a/src/5014002/regexec.c
+++ b/src/5014002/regexec.c
@@ -72,8 +72,11 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5014003/regcomp.c b/src/5014003/regcomp.c
index e72e2ee..3688c94 100644
--- a/src/5014003/regcomp.c
+++ b/src/5014003/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5014003/regexec.c b/src/5014003/regexec.c
index f83c013..f35d742 100644
--- a/src/5014003/regexec.c
+++ b/src/5014003/regexec.c
@@ -72,8 +72,11 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5014004/regcomp.c b/src/5014004/regcomp.c
index 52071c6..26feaff 100644
--- a/src/5014004/regcomp.c
+++ b/src/5014004/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5014004/regexec.c b/src/5014004/regexec.c
index f83c013..f35d742 100644
--- a/src/5014004/regexec.c
+++ b/src/5014004/regexec.c
@@ -72,8 +72,11 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5016000/regcomp.c b/src/5016000/regcomp.c
index 5367ce4..61807b4 100644
--- a/src/5016000/regcomp.c
+++ b/src/5016000/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5016000/regexec.c b/src/5016000/regexec.c
index 366ca1d..c676e3c 100644
--- a/src/5016000/regexec.c
+++ b/src/5016000/regexec.c
@@ -72,8 +72,11 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5016001/regcomp.c b/src/5016001/regcomp.c
index 5367ce4..61807b4 100644
--- a/src/5016001/regcomp.c
+++ b/src/5016001/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5016001/regexec.c b/src/5016001/regexec.c
index 366ca1d..c676e3c 100644
--- a/src/5016001/regexec.c
+++ b/src/5016001/regexec.c
@@ -72,8 +72,11 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5016002/regcomp.c b/src/5016002/regcomp.c
index ef56627..7b13e43 100644
--- a/src/5016002/regcomp.c
+++ b/src/5016002/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5016002/regexec.c b/src/5016002/regexec.c
index 366ca1d..c676e3c 100644
--- a/src/5016002/regexec.c
+++ b/src/5016002/regexec.c
@@ -72,8 +72,11 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5016003/regcomp.c b/src/5016003/regcomp.c
index ef56627..7b13e43 100644
--- a/src/5016003/regcomp.c
+++ b/src/5016003/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5016003/regexec.c b/src/5016003/regexec.c
index 366ca1d..c676e3c 100644
--- a/src/5016003/regexec.c
+++ b/src/5016003/regexec.c
@@ -72,8 +72,11 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5018000/regcomp.c b/src/5018000/regcomp.c
index 63f8dc6..6b1ba51 100644
--- a/src/5018000/regcomp.c
+++ b/src/5018000/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5018000/regexec.c b/src/5018000/regexec.c
index f2ea7bb..4e02305 100644
--- a/src/5018000/regexec.c
+++ b/src/5018000/regexec.c
@@ -82,8 +82,11 @@ static const char* const non_utf8_target_but_utf8_required
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5018001/regcomp.c b/src/5018001/regcomp.c
index 7f81f26..8125261 100644
--- a/src/5018001/regcomp.c
+++ b/src/5018001/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5018001/regexec.c b/src/5018001/regexec.c
index 7c307bd..0a8d1e1 100644
--- a/src/5018001/regexec.c
+++ b/src/5018001/regexec.c
@@ -82,8 +82,11 @@ static const char* const non_utf8_target_but_utf8_required
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5018002/regcomp.c b/src/5018002/regcomp.c
index 7975140..b6b8dde 100644
--- a/src/5018002/regcomp.c
+++ b/src/5018002/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5018002/regexec.c b/src/5018002/regexec.c
index 7c307bd..0a8d1e1 100644
--- a/src/5018002/regexec.c
+++ b/src/5018002/regexec.c
@@ -82,8 +82,11 @@ static const char* const non_utf8_target_but_utf8_required
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5018003/regcomp.c b/src/5018003/regcomp.c
index 7975140..b6b8dde 100644
--- a/src/5018003/regcomp.c
+++ b/src/5018003/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5018003/regexec.c b/src/5018003/regexec.c
index 7c307bd..0a8d1e1 100644
--- a/src/5018003/regexec.c
+++ b/src/5018003/regexec.c
@@ -82,8 +82,11 @@ static const char* const non_utf8_target_but_utf8_required
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5018004/regcomp.c b/src/5018004/regcomp.c
index 7975140..b6b8dde 100644
--- a/src/5018004/regcomp.c
+++ b/src/5018004/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5018004/regexec.c b/src/5018004/regexec.c
index 7c307bd..0a8d1e1 100644
--- a/src/5018004/regexec.c
+++ b/src/5018004/regexec.c
@@ -82,8 +82,11 @@ static const char* const non_utf8_target_but_utf8_required
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5020000/regcomp.c b/src/5020000/regcomp.c
index 2e6d5e2..8607864 100644
--- a/src/5020000/regcomp.c
+++ b/src/5020000/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5020000/regexec.c b/src/5020000/regexec.c
index 5bf42fe..79dadc1 100644
--- a/src/5020000/regexec.c
+++ b/src/5020000/regexec.c
@@ -72,8 +72,11 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5020001/regcomp.c b/src/5020001/regcomp.c
index 93a81fa..66cecca 100644
--- a/src/5020001/regcomp.c
+++ b/src/5020001/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5020001/regexec.c b/src/5020001/regexec.c
index 5bf42fe..79dadc1 100644
--- a/src/5020001/regexec.c
+++ b/src/5020001/regexec.c
@@ -72,8 +72,11 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5020002/regcomp.c b/src/5020002/regcomp.c
index 3ff1813..5af3653 100644
--- a/src/5020002/regcomp.c
+++ b/src/5020002/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5020002/regexec.c b/src/5020002/regexec.c
index ba2070d..c7e0d20 100644
--- a/src/5020002/regexec.c
+++ b/src/5020002/regexec.c
@@ -72,8 +72,11 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/5022000/regcomp.c b/src/5022000/regcomp.c
index 613c281..ec6512d 100644
--- a/src/5022000/regcomp.c
+++ b/src/5022000/regcomp.c
@@ -72,7 +72,10 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGCOMP_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
+#undef PERL_IN_XSUB_RE
 
 #ifndef PERL_IN_XSUB_RE
 #include "re_defs.h"
diff --git a/src/5022000/regexec.c b/src/5022000/regexec.c
index 1f7f066..f1523fa 100644
--- a/src/5022000/regexec.c
+++ b/src/5022000/regexec.c
@@ -75,8 +75,11 @@
  */
 #include "EXTERN.h"
 #define PERL_IN_REGEXEC_C
+#undef PERL_IN_XSUB_RE
+#define PERL_IN_XSUB_RE 1
 #include "perl.h"
 #include "re_defs.h"
+#undef PERL_IN_XSUB_RE
 
 #ifdef PERL_IN_XSUB_RE
 #  include "re_comp.h"
diff --git a/src/update.pl b/src/update.pl
index e62b78e..1b5834e 100644
--- a/src/update.pl
+++ b/src/update.pl
@@ -300,13 +300,14 @@ sub fetch_source_file {
 my %patched_chunks;
 my %expected_chunks = (
  'regcomp.c' => [
+  'PERL_IN_XSUB_RE',
   're_defs',
   'COMP_NODE_HOOK',
   'COMP_BEGIN_HOOK',
   ('COMP_NODE_HOOK') x 3,
  ],
  'regexec.c' => [
-  're_defs',
+  'PERL_IN_XSUB_RE+re_defs',
   'EXEC_NODE_HOOK',
  ],
 );
@@ -314,7 +315,15 @@ my %expected_chunks = (
 sub patch_regcomp {
  my ($line, $file) = @_;
 
- if ($line =~ /#\s*include\s+"INTERN\.h"/) {
+ if ($line =~ /#\s*include\s+"perl\.h"/) {
+  push @{$patched_chunks{$file}}, 'PERL_IN_XSUB_RE';
+  return (
+   "#undef PERL_IN_XSUB_RE\n",
+   "#define PERL_IN_XSUB_RE 1\n",
+   $line,
+   "#undef PERL_IN_XSUB_RE\n",
+  );
+ } elsif ($line =~ /#\s*include\s+"INTERN\.h"/) {
   push @{$patched_chunks{$file}}, 're_defs';
   return "#include \"re_defs.h\"\n";
  } elsif ($line =~ /^(\s*)RExC_rxi\s*=\s*ri\s*;\s*$/) {
@@ -339,8 +348,14 @@ sub patch_regexec {
  my ($line, $file) = @_;
 
  if ($line =~ /#\s*include\s+"perl\.h"/) {
-  push @{$patched_chunks{$file}}, 're_defs';
-  return $line, "#include \"re_defs.h\"\n";
+  push @{$patched_chunks{$file}}, 'PERL_IN_XSUB_RE+re_defs';
+  return (
+   "#undef PERL_IN_XSUB_RE\n",
+   "#define PERL_IN_XSUB_RE 1\n",
+   $line,
+   "#include \"re_defs.h\"\n",
+   "#undef PERL_IN_XSUB_RE\n",
+  );
  } elsif ($line =~ /^\s*reenter_switch:\s*$/) {
   push @{$patched_chunks{$file}}, 'EXEC_NODE_HOOK';
   return "\tREH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);\n", $line;