Removed ugly code done as part of NetWare change, upon Andi's advice. Now, the typeca...

diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index 21ca18a177d3633af667af65516963a81570ecfc..134f291285fc990d56a853bcb5435292aec1ca68 100644 (file)
--- a/sapi/apache/php_apache.c
+++ b/sapi/apache/php_apache.c
@@ -77,11 +77,7 @@ static void php_apache_globals_ctor(php_apache_info_struct *apache_globals TSRML
 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