Reverted the changes because the problem was elsewhere.

diff --git a/ext/mbstring/mbregex.c b/ext/mbstring/mbregex.c
index f524e662e1645bb83646e340e2c6374fba4e6798..34a0550cb4ad2b8b55177d6bcb405156c69340cf 100644 (file)
--- a/ext/mbstring/mbregex.c
+++ b/ext/mbstring/mbregex.c
@@ -22,7 +22,6 @@
 /* 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.dsp b/ext/mbstring/mbstring.dsp
index a251f761e7d0e1f3c15fee113f572c7971f70651..d40c9910ad81d8620682109de59ef31400609d08 100644 (file)
--- a/ext/mbstring/mbstring.dsp
+++ b/ext/mbstring/mbstring.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MBSTRING_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_MBSTRING" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D MBSTRING_EXPORTS=1 /FR /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "_MBCS" /D "_USRDLL" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_MBSTRING" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D MBSTRING_EXPORTS=1 /D HAVE_MBSTRING=1 /D HAVE_MBREGEX=1 /D HAVE_MBSTR_CN=1 /D HAVE_MBSTR_JA=1 /D HAVE_MBSTR_KR=1 /D HAVE_MBSTR_RU=1 /D HAVE_MBSTR_TW=1 /FR /YX /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x407 /d "NDEBUG"\r
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MBSTRING_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "MBSTRING_EXPORTS" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_MBSTRING" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D MBSTRING_EXPORTS=1 /YX /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "MBSTRING_EXPORTS" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_MBSTRING" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D MBSTRING_EXPORTS=1 /D HAVE_MBSTRING=1 /D HAVE_MBREGEX=1 /D HAVE_MBSTR_CN=1 /D HAVE_MBSTR_JA=1 /D HAVE_MBSTR_KR=1 /D HAVE_MBSTR_RU=1 /D HAVE_MBSTR_TW=1 /YX /FD /GZ /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x407 /d "_DEBUG"\r

diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h
index 20bb6dbe7686baaa0863d91aef52b4f2b1b75840..a3263608b8fe95c76a74e1d6d7e8c219be226a3b 100644 (file)
--- a/ext/mbstring/mbstring.h
+++ b/ext/mbstring/mbstring.h
@@ -49,20 +49,6 @@
 #ifdef COMPILE_DL_MBSTRING
 #undef HAVE_MBSTRING
 #define HAVE_MBSTRING 1
-#ifdef PHP_WIN32
-# undef HAVE_MBREGEX
-# define HAVE_MBREGEX 1
-# 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

diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
index 8ae848ae6fb6807c926387c2042d89424d946e63..39fc048a46b6882001e65725feaee9fbdb1314b8 100644 (file)
--- a/ext/mbstring/php_mbregex.c
+++ b/ext/mbstring/php_mbregex.c
@@ -25,9 +25,9 @@
 
 #include "php.h"
 #include "php_ini.h"
-#include "mbstring.h"
-#include "mbregex.h"
 #include "php_mbregex.h"
+#include "mbregex.h"
+#include "mbstring.h"
 
 #if HAVE_MBREGEX
 

diff --git a/ext/mbstring/php_unicode.c b/ext/mbstring/php_unicode.c
index 968ca2227736c62b6b3e6bd45713e7c0d3a7b79b..d7010337a13870c591bd864ca4be3510a9dfe753 100644 (file)
--- a/ext/mbstring/php_unicode.c
+++ b/ext/mbstring/php_unicode.c
@@ -36,7 +36,6 @@
 
 #include "php.h"
 #include "php_ini.h"
-#include "mbstring.h"
 
 #if HAVE_MBSTRING
 

diff --git a/ext/mbstring/php_unicode.h b/ext/mbstring/php_unicode.h
index c16a208e0babd935b1c902b4a4e33b052f832483..b4c25132d85158bdef7870167a3f30b2e931d051 100644 (file)
--- a/ext/mbstring/php_unicode.h
+++ b/ext/mbstring/php_unicode.h
@@ -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 *ret_len,
+MBSTRING_API char *php_unicode_convert_case(int case_mode, char *srcstr, size_t srclen, size_t *retlen,
                char *src_encoding TSRMLS_DC);
 
 #define PHP_UNICODE_CASE_UPPER 0