Fixing the Win32 compilation of mbstring with mbregex enabled.

diff --git a/ext/mbstring/mbregex.c b/ext/mbstring/mbregex.c
index 34a0550cb4ad2b8b55177d6bcb405156c69340cf..f524e662e1645bb83646e340e2c6374fba4e6798 100644 (file)
--- a/ext/mbstring/mbregex.c
+++ b/ext/mbstring/mbregex.c
@@ -22,6 +22,7 @@
 /* UTF-8 extension added Jan 16 1999 by Yoshida Masato  <yoshidam@tau.bekkoame.ne.jp> */
 
 #include "php.h"
+#include "mbstring.h"
 
 #if HAVE_MBREGEX
 

diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h
index fdcfc403910decfad08c4b527207b12c97c5cdb8..20bb6dbe7686baaa0863d91aef52b4f2b1b75840 100644 (file)
--- a/ext/mbstring/mbstring.h
+++ b/ext/mbstring/mbstring.h
@@ -51,7 +51,7 @@
 #define HAVE_MBSTRING 1
 #ifdef PHP_WIN32
 # undef HAVE_MBREGEX
-# define HAVE_MBREGEX 0
+# define HAVE_MBREGEX 1
 # undef HAVE_MBSTR_CN
 # define HAVE_MBSTR_CN 1
 # undef HAVE_MBSTR_JA