summaryrefslogtreecommitdiff
path: root/Zend/zend_alloc.c
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2003-10-17 02:29:06 +0000
committerIlia Alshanetsky <iliaa@php.net>2003-10-17 02:29:06 +0000
commitc66bcc7b748bdee5293323f40cf166521d8ee595 (patch)
treef00db83e96d1a78ca138743c6c4443c1130d47ca /Zend/zend_alloc.c
parent4c4d5a02b90b937ce8c1db37881efdc89b7efd62 (diff)
downloadphp-git-c66bcc7b748bdee5293323f40cf166521d8ee595.tar.gz
Fixed if() condition.
Diffstat (limited to 'Zend/zend_alloc.c')
-rw-r--r--Zend/zend_alloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index f2d6a44f53..960be1dd62 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -78,9 +78,9 @@ static long mem_block_end_magic = MEM_BLOCK_END_MAGIC;
if (AG(memory_limit)+1048576 > AG(allocated_memory) - rs) { \
AG(memory_limit) = AG(allocated_memory) + 1048576; \
if (file) { \
- zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted (tried to allocate %d bytes)", php_mem_limit, s); \
- } else { \
zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted at %s:%d (tried to allocate %d bytes)", php_mem_limit, file, lineno, s); \
+ } else { \
+ zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted (tried to allocate %d bytes)", php_mem_limit, s); \
} \
} else { \
if (file) { \