summaryrefslogtreecommitdiff
path: root/Zend/zend_alloc.c
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2000-08-19 16:51:30 +0000
committerZeev Suraski <zeev@php.net>2000-08-19 16:51:30 +0000
commit79b0a56c51945d4191678dd4ff646e25ac73bed0 (patch)
tree2112566d10cd307474dbbe0015c798cb7e5ee7da /Zend/zend_alloc.c
parent3f4c8e665ab35a36bdd75d91b456710a56254395 (diff)
downloadphp-git-79b0a56c51945d4191678dd4ff646e25ac73bed0.tar.gz
Fix build with no memory_limit
Diffstat (limited to 'Zend/zend_alloc.c')
-rw-r--r--Zend/zend_alloc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index f33aee46d8..4591a804be 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -442,7 +442,9 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache)
}
}
#endif
+#if MEMORY_LIMIT
AG(allocated_memory) -= t->size;
+#endif
p = t->pNext;
REMOVE_POINTER_FROM_LIST(t);
free(t);
@@ -459,7 +461,9 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache)
}
}
}
+#if MEMORY_LIMIT
AG(memory_exhausted)=0;
+#endif
#if (ZEND_DEBUG)
do {