From fe6f8712a439c8b5046a03bca9ce5ae8e75aa4f5 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Fri, 27 Jul 2001 10:16:41 +0000 Subject: - Get rid of ELS_*(), and use TSRMLS_*() instead. - Move to the new ts_allocate_id() API This patch is *bound* to break some files, as I must have had typos somewhere. If you use any uncommon extension, please try to build it... --- sapi/apache/php_apache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sapi/apache/php_apache.c') diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c index c969371526..fd0270414a 100644 --- a/sapi/apache/php_apache.c +++ b/sapi/apache/php_apache.c @@ -90,7 +90,7 @@ PHP_INI_END() -static void php_apache_globals_ctor(php_apache_info_struct *apache_globals) +static void php_apache_globals_ctor(php_apache_info_struct *apache_globals TSRMLS_DC) { apache_globals->in_request = 0; } @@ -99,9 +99,9 @@ static void php_apache_globals_ctor(php_apache_info_struct *apache_globals) static PHP_MINIT_FUNCTION(apache) { #ifdef ZTS - php_apache_info_id = ts_allocate_id(sizeof(php_apache_info_struct), php_apache_globals_ctor, NULL); + ts_allocate_id(&php_apache_info_id, sizeof(php_apache_info_struct), php_apache_globals_ctor, NULL); #else - php_apache_globals_ctor(&php_apache_info); + php_apache_globals_ctor(&php_apache_info TSRMLS_CC); #endif REGISTER_INI_ENTRIES(); return SUCCESS; -- cgit v1.2.1