From: Andi Gutmans <andi@php.net>
Date: Tue, 26 Feb 2002 19:38:41 +0000 (+0000)
Subject: - Hopefully fix the shutdown_memory_manager() stuff. Part of my previous
X-Git-Tag: php-4.2.0RC1~271
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c456da514ce22e2d9a5510e831d480479a8c9646;p=php

- Hopefully fix the shutdown_memory_manager() stuff. Part of my previous
- patch seems to have gotten lost
---

diff --git a/main/main.c b/main/main.c
index f756479fc1..e09e9765e7 100644
--- a/main/main.c
+++ b/main/main.c
@@ -696,8 +696,10 @@ int php_request_startup(TSRMLS_D)
 
 /* {{{ php_request_shutdown_for_exec
  */
-void php_request_shutdown_for_exec(void *dummy TSRMLS_DC)
+void php_request_shutdown_for_exec(void *dummy)
 {
+	TSRMLS_FETCH();
+
 	/* used to close fd's in the 3..255 range here, but it's problematic
 	 */
 	shutdown_memory_manager(1, 1 TSRMLS_CC);
diff --git a/main/php_main.h b/main/php_main.h
index beeabb51c5..ea9137c5f8 100644
--- a/main/php_main.h
+++ b/main/php_main.h
@@ -30,7 +30,7 @@
 
 PHPAPI int php_request_startup(TSRMLS_D);
 PHPAPI void php_request_shutdown(void *dummy);
-PHPAPI void php_request_shutdown_for_exec(void *dummy TSRMLS_DC);
+PHPAPI void php_request_shutdown_for_exec(void *dummy);
 PHPAPI int php_module_startup(sapi_module_struct *sf);
 PHPAPI void php_module_shutdown(TSRMLS_D);
 PHPAPI void php_module_shutdown_for_exec(void);