From: Zeev Suraski <zeev@php.net>
Date: Mon, 30 Oct 2000 23:37:50 +0000 (+0000)
Subject: Fix non-thread-safe Windows build
X-Git-Tag: php-4.0.4RC3~428
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4171da016ce465832d32196e3b8eed014c073704;p=php

Fix non-thread-safe Windows build
---

diff --git a/Zend/Zend.dsp b/Zend/Zend.dsp
index 19bdc481ee..9c207b15d4 100644
--- 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"
 # Begin Source File
 
-SOURCE=".\zend_language_parser.c"
-# End Source File
-# Begin Source File
-
-SOURCE=".\zend_language_scanner.c"
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend.c
 # End Source File
 # Begin Source File
@@ -167,6 +159,22 @@ SOURCE=.\zend_ini.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\zend_ini_parser.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_scanner.c
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_parser.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_scanner.c"
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_list.c
 # End Source File
 # Begin Source File
@@ -211,14 +219,6 @@ SOURCE=.\modules.h
 # End Source File
 # Begin Source File
 
-SOURCE=".\zend_language_parser.h"
-# End Source File
-# Begin Source File
-
-SOURCE=".\zend_language_scanner.h"
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend.h
 # End Source File
 # Begin Source File
@@ -283,6 +283,14 @@ SOURCE=.\zend_ini.h
 # End Source File
 # Begin Source File
 
+SOURCE=".\zend_language_parser.h"
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_scanner.h"
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_list.h
 # End Source File
 # Begin Source File
@@ -311,6 +319,35 @@ SOURCE=.\zend_variables.h
 # PROP Default_Filter "y"
 # Begin Source File
 
+SOURCE=.\zend_ini_parser.y
+
+!IF  "$(CFG)" == "Zend - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
+
+# Begin Custom Build
+InputDir=.
+InputPath=.\zend_ini_parser.y
+
+BuildCmds= \
+	if not "X%CYGWIN%"=="X" bison --output=zend_ini_parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p ini_ zend_ini_parser.y \
+	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 \
+	
+
+"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=".\zend_language_parser.y"
 
 !IF  "$(CFG)" == "Zend - Win32 Release"
@@ -376,6 +413,27 @@ BuildCmds= \
 # PROP Default_Filter "l"
 # Begin Source File
 
+SOURCE=.\zend_ini_scanner.l
+
+!IF  "$(CFG)" == "Zend - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\zend_ini_scanner.l
+
+"zend_ini_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.c zend_ini_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=".\zend_language_scanner.l"
 
 !IF  "$(CFG)" == "Zend - Win32 Release"