Add new files to ZendTS.dsp. Sync list of files in Zend.dsp with ZendTS.dsp. ZTS...

diff --git a/Zend/Zend.dsp b/Zend/Zend.dsp
index 6b2a1d6330fa74c3c8129dbca2a8de38bd937d6d..542fdf724d52a8ad1df1f21ba3b6931319a65211 100644 (file)
--- a/Zend/Zend.dsp
+++ b/Zend/Zend.dsp
@@ -7,20 +7,20 @@
 CFG=Zend - Win32 Release_inline\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
+!MESSAGE\r
 !MESSAGE NMAKE /f "Zend.mak".\r
-!MESSAGE \r
+!MESSAGE\r
 !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\r
 !MESSAGE NMAKE /f "Zend.mak" CFG="Zend - Win32 Release_inline"\r
-!MESSAGE \r
+!MESSAGE\r
 !MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
+!MESSAGE\r
 !MESSAGE "Zend - Win32 Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "Zend - Win32 Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "Zend - Win32 Release_inline" (based on "Win32 (x86) Static Library")\r
-!MESSAGE \r
+!MESSAGE\r
 \r
 # Begin Project\r
 # PROP AllowPerConfigDependencies 0\r
@@ -95,7 +95,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo\r
 # ADD LIB32 /nologo\r
 \r
-!ENDIF \r
+!ENDIF\r
 \r
 # Begin Target\r
 \r
@@ -131,6 +131,14 @@ SOURCE=.\zend_constants.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_default_classes.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\zend_dynamic_array.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_execute.c\r
 # End Source File\r
 # Begin Source File\r
@@ -183,6 +191,14 @@ SOURCE=.\zend_llist.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_mm.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\zend_object_handlers.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_objects.c\r
 # End Source File\r
 # Begin Source File\r
@@ -215,6 +231,14 @@ SOURCE=.\zend_stack.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_stream.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\zend_ts_hash.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_variables.c\r
 # End Source File\r
 # End Group\r
@@ -255,6 +279,14 @@ SOURCE=.\zend_constants.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_default_classes.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\zend_dynamic_array.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_errors.h\r
 # End Source File\r
 # Begin Source File\r
@@ -263,6 +295,10 @@ SOURCE=.\zend_execute.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_execute_locks.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_extensions.h\r
 # End Source File\r
 # Begin Source File\r
@@ -275,6 +311,10 @@ SOURCE=.\zend_globals.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_globals_macros.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_hash.h\r
 # End Source File\r
 # Begin Source File\r
@@ -291,6 +331,18 @@ SOURCE=.\zend_ini.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_ini_parser.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\zend_ini_scanner.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\zend_istdiostream.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=".\zend_language_parser.h"\r
 # End Source File\r
 # Begin Source File\r
@@ -307,10 +359,26 @@ SOURCE=.\zend_llist.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_mm.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_modules.h\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_object_handlers.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\zend_objects.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\zend_objects_API.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_operators.h\r
 # End Source File\r
 # Begin Source File\r
@@ -327,6 +395,14 @@ SOURCE=.\zend_stack.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_stream.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\zend_ts_hash.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_variables.h\r
 # End Source File\r
 # End Group\r
@@ -357,7 +433,7 @@ BuildCmds= \
 \r
 !ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"\r
 \r
-!ENDIF \r
+!ENDIF\r
 \r
 # End Source File\r
 # Begin Source File\r
@@ -412,7 +488,7 @@ BuildCmds= \
    $(BuildCmds)\r
 # End Custom Build\r
 \r
-!ENDIF \r
+!ENDIF\r
 \r
 # End Source File\r
 # End Group\r
@@ -441,7 +517,7 @@ InputPath=.\zend_ini_scanner.l
 \r
 !ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"\r
 \r
-!ENDIF \r
+!ENDIF\r
 \r
 # End Source File\r
 # Begin Source File\r
@@ -478,7 +554,7 @@ InputPath=".\zend_language_scanner.l"
 \r
 # End Custom Build\r
 \r
-!ENDIF \r
+!ENDIF\r
 \r
 # End Source File\r
 # End Group\r

diff --git a/Zend/ZendTS.dsp b/Zend/ZendTS.dsp
index e369d51be300a83ca57e385a6c4d7642eeb95695..8506facbbd855a68c177e0a5055baa313fd64722 100644 (file)
--- a/Zend/ZendTS.dsp
+++ b/Zend/ZendTS.dsp
@@ -7,21 +7,21 @@
 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
+!MESSAGE\r
 !MESSAGE NMAKE /f "ZendTS.mak".\r
-!MESSAGE \r
+!MESSAGE\r
 !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\r
 !MESSAGE NMAKE /f "ZendTS.mak" CFG="ZendTS - Win32 Release_TSDbg"\r
-!MESSAGE \r
+!MESSAGE\r
 !MESSAGE Possible choices for configuration are:\r
-!MESSAGE \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
+!MESSAGE\r
 \r
 # Begin Project\r
 # PROP AllowPerConfigDependencies 0\r
@@ -119,7 +119,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo\r
 # ADD LIB32 /nologo\r
 \r
-!ENDIF \r
+!ENDIF\r
 \r
 # Begin Target\r
 \r
@@ -156,6 +156,10 @@ SOURCE=.\zend_constants.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_default_classes.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_dynamic_array.c\r
 # End Source File\r
 # Begin Source File\r
@@ -300,6 +304,10 @@ SOURCE=.\zend_constants.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_default_classes.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_dynamic_array.h\r
 # End Source File\r
 # Begin Source File\r
@@ -494,7 +502,7 @@ BuildCmds= \
    $(BuildCmds)\r
 # End Custom Build\r
 \r
-!ENDIF \r
+!ENDIF\r
 \r
 # End Source File\r
 # Begin Source File\r
@@ -565,7 +573,7 @@ BuildCmds= \
    $(BuildCmds)\r
 # End Custom Build\r
 \r
-!ENDIF \r
+!ENDIF\r
 \r
 # End Source File\r
 # End Group\r
@@ -620,7 +628,7 @@ InputPath=.\zend_ini_scanner.l
 \r
 # End Custom Build\r
 \r
-!ENDIF \r
+!ENDIF\r
 \r
 # End Source File\r
 # Begin Source File\r
@@ -667,7 +675,7 @@ InputPath=".\zend_language_scanner.l"
 \r
 # End Custom Build\r
 \r
-!ENDIF \r
+!ENDIF\r
 \r
 # End Source File\r
 # End Group\r

diff --git a/Zend/zend_default_classes.c b/Zend/zend_default_classes.c
index bb58bde4c8e67a3de7267a48d8d032c79071ce75..725db0d11ba6c878045a408f0d1f7fa9544a71bb 100644 (file)
--- a/Zend/zend_default_classes.c
+++ b/Zend/zend_default_classes.c
@@ -5,7 +5,7 @@
    | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
+   | that is bundled with this package in the file LICENSE, and is        |
    | available at through the world-wide-web at                           |
    | http://www.zend.com/license/2_00.txt.                                |
    | If you did not receive a copy of the Zend license and are unable to  |
@@ -30,7 +30,7 @@ ZEND_FUNCTION(exception)
        zval  *tmp;
        zval  *object;
        int    argc = ZEND_NUM_ARGS();
-       
+
        if (zend_get_parameters_ex(argc, &message, &code) == FAILURE) {
                ZEND_WRONG_PARAM_COUNT();
        }
@@ -80,28 +80,28 @@ ZEND_FUNCTION(getfile)
 {
        DEFAULT_0_PARAMS;
 
-       _default_exception_get_entry(getThis(), "file", sizeof("file"), return_value);
+       _default_exception_get_entry(getThis(), "file", sizeof("file"), return_value TSRMLS_CC);
 }
 
 ZEND_FUNCTION(getline)
 {
        DEFAULT_0_PARAMS;
 
-       _default_exception_get_entry(getThis(), "line", sizeof("line"), return_value);
+       _default_exception_get_entry(getThis(), "line", sizeof("line"), return_value TSRMLS_CC);
 }
 
 ZEND_FUNCTION(getmessage)
 {
        DEFAULT_0_PARAMS;
 
-       _default_exception_get_entry(getThis(), "message", sizeof("message"), return_value);
+       _default_exception_get_entry(getThis(), "message", sizeof("message"), return_value TSRMLS_CC);
 }
 
 ZEND_FUNCTION(getcode)
 {
        DEFAULT_0_PARAMS;
 
-       _default_exception_get_entry(getThis(), "code", sizeof("code"), return_value);
+       _default_exception_get_entry(getThis(), "code", sizeof("code"), return_value TSRMLS_CC);
 }
 
 static zend_function_entry default_exception_functions[] = {
@@ -123,7 +123,7 @@ static void zend_register_default_exception(TSRMLS_C)
 
 ZEND_API void zend_register_default_classes(TSRMLS_D)
 {
-       zend_register_default_exception(TSRMLS_CC);
+       zend_register_default_exception(TSRMLS_C);
 }
 
 /*

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index bb58bde4c8e67a3de7267a48d8d032c79071ce75..725db0d11ba6c878045a408f0d1f7fa9544a71bb 100644 (file)
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -5,7 +5,7 @@
    | Copyright (c) 1998-2003 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
+   | that is bundled with this package in the file LICENSE, and is        |
    | available at through the world-wide-web at                           |
    | http://www.zend.com/license/2_00.txt.                                |
    | If you did not receive a copy of the Zend license and are unable to  |
@@ -30,7 +30,7 @@ ZEND_FUNCTION(exception)
        zval  *tmp;
        zval  *object;
        int    argc = ZEND_NUM_ARGS();
-       
+
        if (zend_get_parameters_ex(argc, &message, &code) == FAILURE) {
                ZEND_WRONG_PARAM_COUNT();
        }
@@ -80,28 +80,28 @@ ZEND_FUNCTION(getfile)
 {
        DEFAULT_0_PARAMS;
 
-       _default_exception_get_entry(getThis(), "file", sizeof("file"), return_value);
+       _default_exception_get_entry(getThis(), "file", sizeof("file"), return_value TSRMLS_CC);
 }
 
 ZEND_FUNCTION(getline)
 {
        DEFAULT_0_PARAMS;
 
-       _default_exception_get_entry(getThis(), "line", sizeof("line"), return_value);
+       _default_exception_get_entry(getThis(), "line", sizeof("line"), return_value TSRMLS_CC);
 }
 
 ZEND_FUNCTION(getmessage)
 {
        DEFAULT_0_PARAMS;
 
-       _default_exception_get_entry(getThis(), "message", sizeof("message"), return_value);
+       _default_exception_get_entry(getThis(), "message", sizeof("message"), return_value TSRMLS_CC);
 }
 
 ZEND_FUNCTION(getcode)
 {
        DEFAULT_0_PARAMS;
 
-       _default_exception_get_entry(getThis(), "code", sizeof("code"), return_value);
+       _default_exception_get_entry(getThis(), "code", sizeof("code"), return_value TSRMLS_CC);
 }
 
 static zend_function_entry default_exception_functions[] = {
@@ -123,7 +123,7 @@ static void zend_register_default_exception(TSRMLS_C)
 
 ZEND_API void zend_register_default_classes(TSRMLS_D)
 {
-       zend_register_default_exception(TSRMLS_CC);
+       zend_register_default_exception(TSRMLS_C);
 }
 
 /*