php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 01:02:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix ZTS build.

Browse Source
This commit is contained in:
Sebastian Bergmann
2002-11-18 06:04:06 +00:00
parent 6d8a643edb
commit 51e4dbaba0
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
main/SAPI.h
View File

@@ -184,6 +184,7 @@ SAPI_API char *sapi_getenv(char *name, size_t name_len TSRMLS_DC);
SAPI_API char *sapi_get_default_content_type(TSRMLS_D);
SAPI_API void sapi_get_default_content_type_header(sapi_header_struct *default_header TSRMLS_DC);
SAPI_API size_t sapi_apply_default_charset(char **mimetype, size_t len TSRMLS_DC);
SAPI_API void sapi_activate_headers_only(TSRMLS_D);
struct _sapi_module_struct {
char *name;

6
main/main.c
View File

@@ -813,7 +813,7 @@ static int php_hash_environment(TSRMLS_D);
/* {{{ php_start_sapi()
*/
static int php_start_sapi()
static int php_start_sapi(TSRMLS_D)
{
int retval = SUCCESS;
@@ -940,7 +940,7 @@ int php_request_startup_for_hook(TSRMLS_D)
signal(SIGCHLD, sigchld_handler);
#endif
if (php_start_sapi() == FAILURE)
if (php_start_sapi(TSRMLS_C) == FAILURE)
return FAILURE;
php_output_activate(TSRMLS_C);
@@ -991,7 +991,7 @@ void php_request_shutdown_for_hook(void *dummy)
} zend_end_try();
zend_try {
shutdown_memory_manager(CG(unclean_shutdown), 0);
shutdown_memory_manager(CG(unclean_shutdown), 0 TSRMLS_CC);
} zend_end_try();
zend_try {