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 7d8fd6a79d59d2bfa528bda5a693b61ff55836d8..8565dc9dfa14290124070156aa9f46ce34a1ec73 100644 (file)
--- 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 8eda6c803073c9da30e77bb58ffc1b842a9e2add..872ff2494720b0e772893d7ef96e9f9ddd27cf1e 100644 (file)
--- 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 5f37b4c8de4a7393154651289a97afaa92370867..3540e2ee4d2ccfa678dc2986aae389fc80ab58b7 100644 (file)
--- 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 2493ffa38371853c16e91e6d93afd72459d64f5d..798df5814ebca6aea31b5dbad71c06ebd44d9556 100644 (file)
--- 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 7e48f917afa4c397c126651d5285a7f01b302cfd..6f31c1e661df58ed6c690abf432dabcbaf15b0af 100644 (file)
--- 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 2493ffa38371853c16e91e6d93afd72459d64f5d..798df5814ebca6aea31b5dbad71c06ebd44d9556 100644 (file)
--- 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 7e48f917afa4c397c126651d5285a7f01b302cfd..6f31c1e661df58ed6c690abf432dabcbaf15b0af 100644 (file)
--- 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 e2665f2fbdec04f010413487b530e31e564e3ccb..8a6b9cca24760b6908c23d288da06a4aa978c73f 100644 (file)
--- 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 7e48f917afa4c397c126651d5285a7f01b302cfd..6f31c1e661df58ed6c690abf432dabcbaf15b0af 100644 (file)
--- 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 e2665f2fbdec04f010413487b530e31e564e3ccb..8a6b9cca24760b6908c23d288da06a4aa978c73f 100644 (file)
--- 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 7e48f917afa4c397c126651d5285a7f01b302cfd..6f31c1e661df58ed6c690abf432dabcbaf15b0af 100644 (file)
--- 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 e2665f2fbdec04f010413487b530e31e564e3ccb..8a6b9cca24760b6908c23d288da06a4aa978c73f 100644 (file)
--- 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 7e48f917afa4c397c126651d5285a7f01b302cfd..6f31c1e661df58ed6c690abf432dabcbaf15b0af 100644 (file)
--- 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 e2665f2fbdec04f010413487b530e31e564e3ccb..8a6b9cca24760b6908c23d288da06a4aa978c73f 100644 (file)
--- 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 aa5fc92910c613c7873db046265ed93f27de55bd..f26de1b02457f6760832b6bba7aefd0940b727b3 100644 (file)
--- 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 90bea9d6831e3b50da29f06b55015f047ce48785..2ce4da35f1099b4880f4cbbea7f538715a7ce1f0 100644 (file)
--- 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 a933636211a41561beefe755ce1ef94043a9ac39..92372cec0a55356e9dbe682df84f58d141086a87 100644 (file)
--- 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 b9d70dc3c823da7bb149dbc6fb00845af4e311c1..779bdf0728a5df9b0ace62265361070d354afc3a 100644 (file)
--- 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 a933636211a41561beefe755ce1ef94043a9ac39..92372cec0a55356e9dbe682df84f58d141086a87 100644 (file)
--- 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 486b7592466c22899f46add16d88d16e9cead520..6b259b39043bfafa911111b22b9dcb4091d948fd 100644 (file)
--- 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 e72e2ee03a85bea9728a59c3509976b0f234a23d..3688c94eb058949ff5a4f7da3a53179bb59cd22e 100644 (file)
--- 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 f83c01372286c7a11fd4e949b661fdf727b7695e..f35d742351fda55345d6c4fe60d4729f19921ca6 100644 (file)
--- 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 52071c634481692a97fa8440eef85a1609449a7a..26feaff8d8ac154805a9178d0ededf3d47c51819 100644 (file)
--- 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 f83c01372286c7a11fd4e949b661fdf727b7695e..f35d742351fda55345d6c4fe60d4729f19921ca6 100644 (file)
--- 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 5367ce499eb9a56ef2db913c5d3efd6d089bf4b8..61807b4f4304611366901efd158a19e35e82f9d9 100644 (file)
--- 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 366ca1ddb80ed0eaaf32013c7e022cd044b1ec08..c676e3cefb28793567e20c600d9b99f91f285130 100644 (file)
--- 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 5367ce499eb9a56ef2db913c5d3efd6d089bf4b8..61807b4f4304611366901efd158a19e35e82f9d9 100644 (file)
--- 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 366ca1ddb80ed0eaaf32013c7e022cd044b1ec08..c676e3cefb28793567e20c600d9b99f91f285130 100644 (file)
--- 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 ef566277b8838e17b0752a94e83b4e92b989512b..7b13e4374e06d4a9604b79092b7cda6db6311830 100644 (file)
--- 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 366ca1ddb80ed0eaaf32013c7e022cd044b1ec08..c676e3cefb28793567e20c600d9b99f91f285130 100644 (file)
--- 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 ef566277b8838e17b0752a94e83b4e92b989512b..7b13e4374e06d4a9604b79092b7cda6db6311830 100644 (file)
--- 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 366ca1ddb80ed0eaaf32013c7e022cd044b1ec08..c676e3cefb28793567e20c600d9b99f91f285130 100644 (file)
--- 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 63f8dc6d3c22de67f021f8d75aa9446cb5981ee8..6b1ba51972828f4fbbae0bbdf9e9946e2ed366ef 100644 (file)
--- 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 f2ea7bb6e346b3b00079943be96e285e520017ad..4e02305922d8788f759cf827f840e956a655ac4e 100644 (file)
--- 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 7f81f262bac9e287a50fbd0561f9bbf2d06d001f..8125261e41fc5a823cdcda0b1b120cc490f0ddfe 100644 (file)
--- 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 7c307bdf2d0b30858561efa0bda3e7e0e985a81a..0a8d1e1965f471c7a3c1b2dfa99b42d11a18e055 100644 (file)
--- 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 79751403cc8044d41bbe9c8c6425db2787ebc273..b6b8dde8e90eae4d5b5f3bc9f2d7abaabd5cf570 100644 (file)
--- 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 7c307bdf2d0b30858561efa0bda3e7e0e985a81a..0a8d1e1965f471c7a3c1b2dfa99b42d11a18e055 100644 (file)
--- 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 79751403cc8044d41bbe9c8c6425db2787ebc273..b6b8dde8e90eae4d5b5f3bc9f2d7abaabd5cf570 100644 (file)
--- 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 7c307bdf2d0b30858561efa0bda3e7e0e985a81a..0a8d1e1965f471c7a3c1b2dfa99b42d11a18e055 100644 (file)
--- 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 79751403cc8044d41bbe9c8c6425db2787ebc273..b6b8dde8e90eae4d5b5f3bc9f2d7abaabd5cf570 100644 (file)
--- 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 7c307bdf2d0b30858561efa0bda3e7e0e985a81a..0a8d1e1965f471c7a3c1b2dfa99b42d11a18e055 100644 (file)
--- 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 2e6d5e215e83e4aea22d8c5038f96fc2c4baef43..86078640bb96a3a71deebb5b1f02392bc7baddf8 100644 (file)
--- 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 5bf42fe6ee85bebae22a92d4d8087a73963fbfc0..79dadc15ade1511a1682063b453076d26d1bb31e 100644 (file)
--- 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 93a81fa4de70803fe0c4486cd0e6c28ebf7c96f9..66ceccab6a0f4781e8cda4eaf2edc32b8dcb10de 100644 (file)
--- 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 5bf42fe6ee85bebae22a92d4d8087a73963fbfc0..79dadc15ade1511a1682063b453076d26d1bb31e 100644 (file)
--- 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 3ff18131139f0148e1880b051a34c895a9bc4577..5af36530df5e5891bc86dd9d805468459308edc2 100644 (file)
--- 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 ba2070d531a1e6831d7066f6f8b59de7f2f4d8f8..c7e0d206fda2da4e5671c6dccca6e613590604bb 100644 (file)
--- 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 613c281a021e3b4a544df77ccee51133c679593e..ec6512dc477a9f36734283ea272e43229289a9a1 100644 (file)
--- 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 1f7f06692bc021f82c3fc1a16304a2f7ae7f81b5..f1523fa46e27f2e08be4fe41c6434623859bb8a4 100644 (file)
--- 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 e62b78e2b8309381a1fe1351af229cd45dca786d..1b5834e3045c6544635e9f71aec363a6c97949b9 100644 (file)
--- 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;