summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>1999-04-10 16:24:28 +0000
committerZeev Suraski <zeev@php.net>1999-04-10 16:24:28 +0000
commit4472d0502587f31b77251b2027f3eff858e65add (patch)
tree0df122d21d2fd2a7ce5333f3c8518aa202efd2a4 /Zend
parent2e9886de3c4a155c45a16e74d2e6e4b7c6d31892 (diff)
downloadphp-git-4472d0502587f31b77251b2027f3eff858e65add.tar.gz
Allow runtime setting of the memory limit
Diffstat (limited to 'Zend')
-rw-r--r--Zend/zend_alloc.c2
-rw-r--r--Zend/zend_alloc.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index eb1cc68656..6831ae31af 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -304,7 +304,7 @@ ZEND_API char *zend_strndup(const char *s, uint length)
}
-ZEND_API int set_memory_limit(unsigned int memory_limit)
+ZEND_API int zend_set_memory_limit(unsigned int memory_limit)
{
#if MEMORY_LIMIT
ALS_FETCH();
diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h
index 9fe4d74320..85492a2c43 100644
--- a/Zend/zend_alloc.h
+++ b/Zend/zend_alloc.h
@@ -92,7 +92,7 @@ ZEND_API void _persist_alloc(void *ptr);
#define safe_estrdup(ptr) ((ptr)?(estrdup(ptr)):(empty_string))
#define safe_estrndup(ptr,len) ((ptr)?(estrndup((ptr),(len))):(empty_string))
-ZEND_API int set_memory_limit(unsigned int memory_limit);
+ZEND_API int zend_set_memory_limit(unsigned int memory_limit);
ZEND_API void start_memory_manager(void);
ZEND_API void shutdown_memory_manager(int silent, int clean_cache);