diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-02-06 09:38:50 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-02-06 09:38:50 +0100 |
| commit | 45d2df5f119d17804ccf6068cbe1132e118579b2 (patch) | |
| tree | e3014245763e4290de480fad0b1142728314b965 /Zend/zend_alloc.c | |
| parent | b33060af82c648bb3971de9d8fe67e52781cbd7a (diff) | |
| parent | e5ded6e843fc43dde4b6c65405a1d3e2ae026eb4 (diff) | |
| download | php-git-broken-5.6-20140206.tar.gz | |
Merge branch 'datibbaw/pow-operator' into PHP-5.6broken-5.6-20140206
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index bdcee5cbe4..f621487819 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -2682,10 +2682,8 @@ ZEND_API char *zend_strndup(const char *s, uint length) } -ZEND_API int zend_set_memory_limit(size_t memory_limit) +ZEND_API int zend_set_memory_limit(size_t memory_limit TSRMLS_DC) { - TSRMLS_FETCH(); - AG(mm_heap)->limit = (memory_limit >= AG(mm_heap)->block_size) ? memory_limit : AG(mm_heap)->block_size; return SUCCESS; |