- Use supplied istdiostream definition for the INI scanner too

- Add Release_TSDbg configuration

diff --git a/Zend/ZendTS.dsp b/Zend/ZendTS.dsp
index 6f280803c912c2bcf710ba6a294d5d5ea7064018..435faf43aee7bd9b937edf66019afa7b833e8bfa 100644 (file)
--- a/Zend/ZendTS.dsp
+++ b/Zend/ZendTS.dsp
@@ -4,7 +4,7 @@
 \r
 # TARGTYPE "Win32 (x86) Static Library" 0x0104\r
 \r
-CFG=ZendTS - Win32 Release_TS_inline\r
+CFG=ZendTS - Win32 Release_TSDbg\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
 !MESSAGE \r
@@ -13,13 +13,14 @@ CFG=ZendTS - Win32 Release_TS_inline
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
 !MESSAGE \r
-!MESSAGE NMAKE /f "ZendTS.mak" CFG="ZendTS - Win32 Release_TS_inline"\r
+!MESSAGE NMAKE /f "ZendTS.mak" CFG="ZendTS - Win32 Release_TSDbg"\r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
 !MESSAGE "ZendTS - Win32 Release_TS" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "ZendTS - Win32 Debug_TS" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "ZendTS - Win32 Release_TS_inline" (based on "Win32 (x86) Static Library")\r
+!MESSAGE "ZendTS - Win32 Release_TSDbg" (based on "Win32 (x86) Static Library")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -95,6 +96,29 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo\r
 # ADD LIB32 /nologo\r
 \r
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Output_Dir "ZendTS___Win32_Release_TSDbg"\r
+# PROP BASE Intermediate_Dir "ZendTS___Win32_Release_TSDbg"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Output_Dir "Release_TSDbg"\r
+# PROP Intermediate_Dir "Release_TSDbg"\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D ZEND_DEBUG=0 /D _WIN32_WINNT=0x400 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /c\r
+# SUBTRACT BASE CPP /YX\r
+# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I "." /D "NDebug_TS" /D ZEND_DEBUG=0 /D _WIN32_WINNT=0x400 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /c\r
+# SUBTRACT CPP /YX\r
+# ADD BASE RSC /l 0x40d /d "NDebug_TS"\r
+# ADD RSC /l 0x40d /d "NDebug_TS"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LIB32=link.exe -lib\r
+# ADD BASE LIB32 /nologo\r
+# ADD LIB32 /nologo\r
+\r
 !ENDIF \r
 \r
 # Begin Target\r
@@ -102,6 +126,7 @@ LIB32=link.exe -lib
 # Name "ZendTS - Win32 Release_TS"\r
 # Name "ZendTS - Win32 Debug_TS"\r
 # Name "ZendTS - Win32 Release_TS_inline"\r
+# Name "ZendTS - Win32 Release_TSDbg"\r
 # Begin Group "Source Files"\r
 \r
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
@@ -392,6 +417,24 @@ BuildCmds= \
        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)" == "ZendTS - Win32 Release_TSDbg"\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
@@ -453,6 +496,24 @@ BuildCmds= \
        if "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend_language_parser.y \\r
        \r
 \r
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+\r
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"\r
+\r
+# Begin Custom Build\r
+InputDir=.\r
+InputPath=".\zend_language_parser.y"\r
+\r
+BuildCmds= \\r
+       if not "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p zend zend_language_parser.y \\r
+       if "X%CYGWIN%"=="X" bison --output=zend_language_parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend_language_parser.y \\r
+       \r
+\r
 "$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
    $(BuildCmds)\r
 \r
@@ -501,6 +562,16 @@ InputPath=.\zend_ini_scanner.l
 \r
 # End Custom Build\r
 \r
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"\r
+\r
+# Begin Custom Build\r
+InputPath=.\zend_ini_scanner.l\r
+\r
+"zend_ini_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       flex -+ -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.cpp zend_ini_scanner.l\r
+\r
+# End Custom Build\r
+\r
 !ENDIF \r
 \r
 # End Source File\r
@@ -538,6 +609,16 @@ InputPath=".\zend_language_scanner.l"
 \r
 # End Custom Build\r
 \r
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"\r
+\r
+# Begin Custom Build\r
+InputPath=".\zend_language_scanner.l"\r
+\r
+"zend_language_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       flex -+ -B -i -Sflex.skl -Pzend -ozend_language_scanner.cpp zend_language_scanner.l\r
+\r
+# End Custom Build\r
+\r
 !ENDIF \r
 \r
 # End Source File\r

diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
index af407b237299dd3f177d00fee35e6b133fdd1b5d..e891ea206f58edf5ec324cd678c050d5bf4be894 100644 (file)
--- a/Zend/zend_ini_scanner.l
+++ b/Zend/zend_ini_scanner.l
@@ -45,6 +45,9 @@
 #define YY_DECL int ini_lex(zval *ini_lval)
 #endif
 
+#include "zend_istdiostream.h"
+
+
 #ifndef ZTS
 static char *ini_filename;
 

diff --git a/Zend/zend_istdiostream.h b/Zend/zend_istdiostream.h
new file mode 100644 (file)
index 0000000..1796abf
--- /dev/null
+++ b/Zend/zend_istdiostream.h
@@ -0,0 +1,15 @@
+#ifndef _ZEND_STDIOSTREAM
+#define _ZEND_STDIOSTREAM
+
+#if defined(ZTS) && !defined(HAVE_CLASS_ISTDIOSTREAM)
+class istdiostream : public istream
+{
+private:
+       stdiobuf _file;
+public:
+       istdiostream (FILE* __f) : istream(), _file(__f) { init(&_file); }
+       stdiobuf* rdbuf()/* const */ { return &_file; }
+};
+#endif
+
+#endif
\ No newline at end of file

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index c88a3805e8f1ab54ad6130302dde78b6d24b9a0f..8b3d8ea5da88b8887d3c518ac9ed082944d0b46d 100644 (file)
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -87,16 +87,7 @@
 #  define MY_INPUT input
 #endif
 
-#if defined(ZTS) && !defined(HAVE_CLASS_ISTDIOSTREAM)
-class istdiostream : public istream
-{
-private:
-       stdiobuf _file;
-public:
-       istdiostream (FILE* __f) : istream(), _file(__f) { init(&_file); }
-       stdiobuf* rdbuf()/* const */ { return &_file; }
-};
-#endif
+#include "zend_istdiostream.h"
 
 #define YY_FATAL_ERROR zend_fatal_scanner_error