applied patch from Ilya, tweaked some to get clean static build of

the ext/re stuff (untested on win32)

p4raw-id: //depot/perl@1393

diff --git a/regcomp.c b/regcomp.c
index 663933d..f9e2539 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -20,9 +20,13 @@
 */
 
 #ifdef IN_XSUB_RE
+/* We *really* need to overwrite these symbols: */
 #  define Perl_pregcomp my_regcomp
 #  define Perl_regdump my_regdump
 #  define Perl_regprop my_regprop
+/* *These* symbols are masked to allow static link. */
+#  define Perl_pregfree my_regfree
+#  define Perl_regnext my_regnext
 #endif 
 
 /*SUPPRESS 112*/
@@ -61,7 +65,10 @@
  */
 #include "EXTERN.h"
 #include "perl.h"
-#include "INTERN.h"
+
+#ifndef IN_XSUB_RE
+#  include "INTERN.h"
+#endif
 
 #define REG_COMP_C
 #include "regcomp.h"

diff --git a/regexec.c b/regexec.c
index 505bc28..deb61aa 100644 (file)
--- a/regexec.c
+++ b/regexec.c
@@ -20,9 +20,12 @@
 */
 
 #ifdef IN_XSUB_RE
+/* We *really* need to overwrite these symbols: */
 #  define Perl_regexec_flags my_regexec
 #  define Perl_regdump my_regdump
 #  define Perl_regprop my_regprop
+/* *These* symbols are masked to allow static link. */
+#  define Perl_pregexec my_pregexec
 #endif 
 
 /*SUPPRESS 112*/