MFH (relly disable compilation of mbstring)

diff --git a/win32/php4dll.dsp b/win32/php4dll.dsp
index 151d7ffc99a3034c49475dea1d4fc5fad911ee42..d234c435645f7c792998f53d5fad0b3d0d809e71 100644 (file)
--- a/win32/php4dll.dsp
+++ b/win32/php4dll.dsp
@@ -205,27 +205,27 @@ SOURCE=..\main\SAPI.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\streams.c\r
+SOURCE=..\main\snprintf.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\user_streams.c\r
+SOURCE=..\main\spprintf.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\strlcat.c\r
+SOURCE=..\main\streams.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\strlcpy.c\r
+SOURCE=..\main\strlcat.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\snprintf.c\r
+SOURCE=..\main\strlcpy.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\spprintf.c\r
+SOURCE=..\main\user_streams.c\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
@@ -239,40 +239,20 @@ SOURCE=..\ext\standard\aggregation.h
 \r
 SOURCE=..\main\config.w32.h.in\r
 \r
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"\r
-\r
-# Begin Custom Build - Generating main/config.w32.h\r
-InputPath=..\main\config.w32.h.in\r
-\r
-"config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       if not exist ..\main\config.w32.h (\r
-         copy ..\main\config.w32.h.in ..\main\config.w32.h > nul\r
-       )\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
-\r
-# Begin Custom Build - Generating main/config.w32.h\r
-InputPath=..\main\config.w32.h.in\r
-\r
-"config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       if not exist ..\main\config.w32.h (\r
-         copy ..\main\config.w32.h.in ..\main\config.w32.h > nul\r
-       )\r
+!IF  "$(CFG)" == "php4dll - Win32 Debug"\r
 \r
-# End Custom Build\r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"\r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
 # Begin Custom Build - Generating main/config.w32.h\r
 InputPath=..\main\config.w32.h.in\r
 \r
 "config.w32.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       if not exist ..\main\config.w32.h (\r
-         copy ..\main\config.w32.h.in ..\main\config.w32.h > nul\r
-       )\r
-\r
+       if not exist ..\main\config.w32.h ( \r
+       copy ..\main\config.w32.h.in ..\main\config.w32.h > nul \r
+       ) \r
+       \r
 # End Custom Build\r
 \r
 !ENDIF \r
@@ -348,27 +328,27 @@ SOURCE=..\main\php_variables.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\snprintf.h\r
+SOURCE=..\ext\standard\quot_print.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\spprintf.h\r
+SOURCE=..\main\rfc1867.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\ext\standard\quot_print.h\r
+SOURCE=..\main\safe_mode.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\rfc1867.h\r
+SOURCE=..\main\SAPI.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\safe_mode.h\r
+SOURCE=..\main\snprintf.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\SAPI.h\r
+SOURCE=..\main\spprintf.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -911,50 +891,6 @@ SOURCE=..\ext\ctype\ctype.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\ext\mbstring\mbfilter.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\mbstring\mbfilter_cn.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\mbstring\mbfilter_ja.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\mbstring\mbfilter_kr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\mbstring\mbfilter_ru.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\mbstring\mbfilter_tw.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\mbstring\mbregex.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\mbstring\mbstring.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\mbstring\php_mbregex.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\mbstring\php_unicode.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\mbstring\html_entities.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\ext\overload\overload.c\r
 # End Source File\r
 # Begin Source File\r

diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index 640cf6dfb03027e5e6fb6d8ca92a61d8526585fa..95720e61f7ea2f1af4b8be14418fd258bc945db4 100644 (file)
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -450,22 +450,22 @@ SOURCE=..\ext\pcre\pcrelib\chartables.c
 # Begin Source File\r
 \r
 SOURCE=..\ext\pcre\pcrelib\get.c\r
-# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D "LINK_SIZE=2"\r
+# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D LINK_SIZE=2\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\pcre\pcrelib\maketables.c\r
-# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D "LINK_SIZE=2"\r
+# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D LINK_SIZE=2\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\pcre\pcrelib\pcre.c\r
-# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D "LINK_SIZE=2"\r
+# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D LINK_SIZE=2\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\pcre\pcrelib\study.c\r
-# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D "LINK_SIZE=2"\r
+# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D LINK_SIZE=2\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files No. 3"\r
@@ -513,54 +513,10 @@ SOURCE=..\ext\ctype\ctype.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\ext\mbstring\html_entities.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\mbstring\mbfilter.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\mbstring\mbfilter_cn.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\mbstring\mbfilter_ja.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\mbstring\mbfilter_kr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\mbstring\mbfilter_ru.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\mbstring\mbfilter_tw.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\mbstring\mbregex.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\mbstring\mbstring.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\ext\overload\overload.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\ext\mbstring\php_mbregex.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\mbstring\php_unicode.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\ext\tokenizer\tokenizer.c\r
 # End Source File\r
 # Begin Source File\r