Fix non-thread-safe Windows build

diff --git a/Zend/Zend.dsp b/Zend/Zend.dsp
index 19bdc481ee2029d2f9712d752e7862df2e1a847a..9c207b15d40a6b94758c1aa34d8fa6d0758866c8 100644 (file)
--- a/Zend/Zend.dsp
+++ b/Zend/Zend.dsp
@@ -107,14 +107,6 @@ LIB32=link.exe -lib
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 # Begin Source File\r
 \r
-SOURCE=".\zend_language_parser.c"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=".\zend_language_scanner.c"\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\zend.c\r
 # End Source File\r
 # Begin Source File\r
@@ -167,6 +159,22 @@ SOURCE=.\zend_ini.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_ini_parser.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\zend_ini_scanner.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zend_language_parser.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zend_language_scanner.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_list.c\r
 # End Source File\r
 # Begin Source File\r
@@ -211,14 +219,6 @@ SOURCE=.\modules.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=".\zend_language_parser.h"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=".\zend_language_scanner.h"\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\zend.h\r
 # End Source File\r
 # Begin Source File\r
@@ -283,6 +283,14 @@ SOURCE=.\zend_ini.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=".\zend_language_parser.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\zend_language_scanner.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_list.h\r
 # End Source File\r
 # Begin Source File\r
@@ -311,6 +319,35 @@ SOURCE=.\zend_variables.h
 # PROP Default_Filter "y"\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_ini_parser.y\r
+\r
+!IF  "$(CFG)" == "Zend - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"\r
+\r
+# Begin Custom Build\r
+InputDir=.\r
+InputPath=.\zend_ini_parser.y\r
+\r
+BuildCmds= \\r
+       if not "X%CYGWIN%"=="X" bison --output=zend_ini_parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p ini_ zend_ini_parser.y \\r
+       if "X%CYGWIN%"=="X" bison --output=zend_ini_parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p ini_ zend_ini_parser.y \\r
+       \r
+\r
+"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+\r
+"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=".\zend_language_parser.y"\r
 \r
 !IF  "$(CFG)" == "Zend - Win32 Release"\r
@@ -376,6 +413,27 @@ BuildCmds= \
 # PROP Default_Filter "l"\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_ini_scanner.l\r
+\r
+!IF  "$(CFG)" == "Zend - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"\r
+\r
+# Begin Custom Build\r
+InputPath=.\zend_ini_scanner.l\r
+\r
+"zend_ini_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       flex -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.c zend_ini_scanner.l\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=".\zend_language_scanner.l"\r
 \r
 !IF  "$(CFG)" == "Zend - Win32 Release"\r