From: Venkat Raghavan S <rvenkat@php.net>
Date: Fri, 31 May 2002 09:07:12 +0000 (+0000)
Subject: Removed ugly code done as part of NetWare change, upon Andi's advice. Now, the typeca... 
X-Git-Tag: php-4.3.0dev_zend2_alpha1~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecdbaeced17affd6895537746f69ac2824339184;p=php

Removed ugly code done as part of NetWare change, upon Andi's advice. Now, the typecasting is done for all platforms.
---

diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index 21ca18a177..134f291285 100644
--- 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