cvs: /php4 main.c
| From: | Andrei Zmievski | Date: | Wed, 15 Dec 1999 17:41:49 +0000 |
| Subject: | cvs: /php4 main.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-7954@lists.php.net to get a copy of this message | ||
andrei Wed Dec 15 12:41:49 1999 EDT
Modified files:
/php4 main.c
Log:
(return_one) removed.
(OnChangeMemoryLimit) Only defined if MEMORY_LIMIT is defined.
Index: php4/main.c
diff -u php4/main.c:1.156 php4/main.c:1.157
--- php4/main.c:1.156 Wed Dec 15 12:37:05 1999
+++ php4/main.c Wed Dec 15 12:41:19 1999
@@ -19,7 +19,7 @@
*/
-/* $Id: main.c,v 1.156 1999/12/15 17:37:05 andrei Exp $ */
+/* $Id: main.c,v 1.157 1999/12/15 17:41:19 andrei Exp $ */
#include <stdio.h>
@@ -135,6 +135,7 @@
}
+#if MEMORY_LIMIT
static PHP_INI_MH(OnChangeMemoryLimit)
{
int new_limit;
@@ -146,6 +147,7 @@
}
return zend_set_memory_limit(new_limit);
}
+#endif
static PHP_INI_MH(OnUpdateErrorReporting)
@@ -787,12 +789,6 @@
/* used to close fd's in the 3..255 range here, but it's problematic
*/
shutdown_memory_manager(1, 1);
-}
-
-
-static int return_one(void *p)
-{
- return 1;
}