From: Andrei Zmievski <andrei@php.net>
Date: Wed, 15 Dec 1999 17:41:19 +0000 (+0000)
Subject: (return_one) removed.
X-Git-Tag: PRE_LIBZEND_TO_ZEND~73
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=158979f838a9da5da7e44d4e063b10aef010c50f;p=php

(return_one) removed.
(OnChangeMemoryLimit) Only defined if MEMORY_LIMIT is defined.
---

diff --git a/main/main.c b/main/main.c
index c7492c61d4..2d149d0569 100644
--- a/main/main.c
+++ b/main/main.c
@@ -135,6 +135,7 @@ static PHP_INI_MH(OnChangeMaxExecutionTime)
 }
 
 
+#if MEMORY_LIMIT
 static PHP_INI_MH(OnChangeMemoryLimit)
 {
 	int new_limit;
@@ -146,6 +147,7 @@ static PHP_INI_MH(OnChangeMemoryLimit)
 	}
 	return zend_set_memory_limit(new_limit);
 }
+#endif
 
 
 static PHP_INI_MH(OnUpdateErrorReporting)
@@ -790,12 +792,6 @@ void php_request_shutdown_for_exec(void *dummy)
 }
 
 
-static int return_one(void *p)
-{
-	return 1;
-}
-
-
 void php_request_shutdown(void *dummy)
 {
 	CLS_FETCH();