Fixing build on WIn32

MBREGEX is disabled for now. 5 mbre_* functions are undefined on WIn32

Author: fmk

ext/mbstring/mbstring.dsp

@@ -49,6 +49,20 @@
 #ifdef COMPILE_DL_MBSTRING
 #undef HAVE_MBSTRING
 #define HAVE_MBSTRING 1
+#ifdef PHP_WIN32
+# undef HAVE_MBREGEX
+# define HAVE_MBREGEX 0
+# undef HAVE_MBSTR_CN
+# define HAVE_MBSTR_CN 1
+# undef HAVE_MBSTR_JA
+# define HAVE_MBSTR_JA 1
+# undef HAVE_MBSTR_KR
+# define HAVE_MBSTR_KR 1
+# undef HAVE_MBSTR_RU
+# define HAVE_MBSTR_RU 1
+# undef HAVE_MBSTR_TW
+# define HAVE_MBSTR_TW 1
+#endif
 #endif
 
 #ifdef PHP_WIN32

ext/mbstring/mbstring.h

@@ -25,9 +25,9 @@
 
 #include "php.h"
 #include "php_ini.h"
-#include "php_mbregex.h"
-#include "mbregex.h"
 #include "mbstring.h"
+#include "mbregex.h"
+#include "php_mbregex.h"
 
 #if HAVE_MBREGEX
 

ext/mbstring/php_mbregex.c

@@ -36,6 +36,7 @@
 
 #include "php.h"
 #include "php_ini.h"
+#include "mbstring.h"
 
 #if HAVE_MBSTRING
 

ext/mbstring/php_unicode.c

@@ -103,7 +103,7 @@
 
 MBSTRING_API int php_unicode_is_prop(unsigned long code, unsigned long mask1,
 		unsigned long mask2);
-MBSTRING_API char *php_unicode_convert_case(int case_mode, char *srcstr, size_t srclen, size_t *retlen,
+MBSTRING_API char *php_unicode_convert_case(int case_mode, char *srcstr, size_t srclen, size_t *ret_len,
 		char *src_encoding TSRMLS_DC);
 
 #define PHP_UNICODE_CASE_UPPER	0