cvs: php4 /sapi/apache php_apache.c

rvenkat Fri May 31 05:07:12 2002 EDT Modified files: /php4/sapi/apache php_apache.c Log: Removed ugly code done as part of NetWare change, upon Andi's advice. Now, the typecasting is done for all platforms. Index: php4/sapi/apache/php_apache.c diff -u php4/sapi/apache/php_apache.c:1.59 php4/sapi/apache/php_apache.c:1.60 --- php4/sapi/apache/php_apache.c:1.59 Fri May 31 00:47:18 2002 +++ php4/sapi/apache/php_apache.c Fri May 31 05:07:12 2002 @@ -17,7 +17,7 @@ | David Sklar <sklar@student.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.59 2002/05/31 04:47:18 rvenkat Exp $ */ +/* $Id: php_apache.c,v 1.60 2002/05/31 09:07:12 rvenkat Exp $ */ #include "php_apache_http.h" @@ -77,11 +77,7 @@ static PHP_MINIT_FUNCTION(apache) { #ifdef ZTS -#ifndef NETWARE - ts_allocate_id(&php_apache_info_id, sizeof(php_apache_info_struct), php_apache_globals_ctor, NULL); -#else - ts_allocate_id(&php_apache_info_id, sizeof(php_apache_info_struct), (void (*)(void *, void ***))php_apache_globals_ctor, NULL); -#endif + ts_allocate_id(&php_apache_info_id, sizeof(php_apache_info_struct), (ts_allocate_ctor)php_apache_globals_ctor, NULL); #else php_apache_globals_ctor(&php_apache_info TSRMLS_CC); #endif