Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

…TS.dsp. ZTS fixes.
  • Loading branch information...
commit 2dc388e73ed76ec3271acc5e7fa6579873b39abd 1 parent 91a2475
Sebastian Bergmann authored
View
98 Zend/Zend.dsp
@@ -7,20 +7,20 @@
CFG=Zend - Win32 Release_inline
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "Zend.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "Zend.mak" CFG="Zend - Win32 Release_inline"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "Zend - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "Zend - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "Zend - Win32 Release_inline" (based on "Win32 (x86) Static Library")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -95,7 +95,7 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
-!ENDIF
+!ENDIF
# Begin Target
@@ -131,6 +131,14 @@ SOURCE=.\zend_constants.c
# End Source File
# Begin Source File
+SOURCE=.\zend_default_classes.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_dynamic_array.c
+# End Source File
+# Begin Source File
+
SOURCE=.\zend_execute.c
# End Source File
# Begin Source File
@@ -183,6 +191,14 @@ SOURCE=.\zend_llist.c
# End Source File
# Begin Source File
+SOURCE=.\zend_mm.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_object_handlers.c
+# End Source File
+# Begin Source File
+
SOURCE=.\zend_objects.c
# End Source File
# Begin Source File
@@ -215,6 +231,14 @@ SOURCE=.\zend_stack.c
# End Source File
# Begin Source File
+SOURCE=.\zend_stream.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ts_hash.c
+# End Source File
+# Begin Source File
+
SOURCE=.\zend_variables.c
# End Source File
# End Group
@@ -255,6 +279,14 @@ SOURCE=.\zend_constants.h
# End Source File
# Begin Source File
+SOURCE=.\zend_default_classes.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_dynamic_array.h
+# End Source File
+# Begin Source File
+
SOURCE=.\zend_errors.h
# End Source File
# Begin Source File
@@ -263,6 +295,10 @@ SOURCE=.\zend_execute.h
# End Source File
# Begin Source File
+SOURCE=.\zend_execute_locks.h
+# End Source File
+# Begin Source File
+
SOURCE=.\zend_extensions.h
# End Source File
# Begin Source File
@@ -275,6 +311,10 @@ SOURCE=.\zend_globals.h
# End Source File
# Begin Source File
+SOURCE=.\zend_globals_macros.h
+# End Source File
+# Begin Source File
+
SOURCE=.\zend_hash.h
# End Source File
# Begin Source File
@@ -291,6 +331,18 @@ SOURCE=.\zend_ini.h
# End Source File
# Begin Source File
+SOURCE=.\zend_ini_parser.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_scanner.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_istdiostream.h
+# End Source File
+# Begin Source File
+
SOURCE=".\zend_language_parser.h"
# End Source File
# Begin Source File
@@ -307,10 +359,26 @@ SOURCE=.\zend_llist.h
# End Source File
# Begin Source File
+SOURCE=.\zend_mm.h
+# End Source File
+# Begin Source File
+
SOURCE=.\zend_modules.h
# End Source File
# Begin Source File
+SOURCE=.\zend_object_handlers.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_objects.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_objects_API.h
+# End Source File
+# Begin Source File
+
SOURCE=.\zend_operators.h
# End Source File
# Begin Source File
@@ -327,6 +395,14 @@ SOURCE=.\zend_stack.h
# End Source File
# Begin Source File
+SOURCE=.\zend_stream.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ts_hash.h
+# End Source File
+# Begin Source File
+
SOURCE=.\zend_variables.h
# End Source File
# End Group
@@ -357,7 +433,7 @@ BuildCmds= \
!ELSEIF "$(CFG)" == "Zend - Win32 Release_inline"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
@@ -412,7 +488,7 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# End Group
@@ -441,7 +517,7 @@ InputPath=.\zend_ini_scanner.l
!ELSEIF "$(CFG)" == "Zend - Win32 Release_inline"
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
@@ -478,7 +554,7 @@ InputPath=".\zend_language_scanner.l"
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# End Group
View
30 Zend/ZendTS.dsp
@@ -7,21 +7,21 @@
CFG=ZendTS - Win32 Release_TSDbg
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "ZendTS.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "ZendTS.mak" CFG="ZendTS - Win32 Release_TSDbg"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "ZendTS - Win32 Release_TS" (based on "Win32 (x86) Static Library")
!MESSAGE "ZendTS - Win32 Debug_TS" (based on "Win32 (x86) Static Library")
!MESSAGE "ZendTS - Win32 Release_TS_inline" (based on "Win32 (x86) Static Library")
!MESSAGE "ZendTS - Win32 Release_TSDbg" (based on "Win32 (x86) Static Library")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -119,7 +119,7 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
-!ENDIF
+!ENDIF
# Begin Target
@@ -156,6 +156,10 @@ SOURCE=.\zend_constants.c
# End Source File
# Begin Source File
+SOURCE=.\zend_default_classes.c
+# End Source File
+# Begin Source File
+
SOURCE=.\zend_dynamic_array.c
# End Source File
# Begin Source File
@@ -300,6 +304,10 @@ SOURCE=.\zend_constants.h
# End Source File
# Begin Source File
+SOURCE=.\zend_default_classes.h
+# End Source File
+# Begin Source File
+
SOURCE=.\zend_dynamic_array.h
# End Source File
# Begin Source File
@@ -494,7 +502,7 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
@@ -565,7 +573,7 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# End Group
@@ -620,7 +628,7 @@ InputPath=.\zend_ini_scanner.l
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# Begin Source File
@@ -667,7 +675,7 @@ InputPath=".\zend_language_scanner.l"
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# End Group
View
14 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);
}
/*
View
14 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);
}
/*
Please sign in to comment.
Something went wrong with that request. Please try again.