(return_one) removed.

(OnChangeMemoryLimit) Only defined if MEMORY_LIMIT is defined.

diff --git a/main/main.c b/main/main.c
index c7492c61d41e01b11551098c2d2d97e5520c54a2..2d149d0569018be5939b64854ae7258c53a56a84 100644 (file)
--- 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();