diff options
| author | Nikita Popov <nikic@php.net> | 2016-12-14 18:11:51 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-12-14 18:11:51 +0100 |
| commit | ef1ed6ab8eeedff5a511e027ac97a98a88fca47f (patch) | |
| tree | 7b02ae7b529276860da08bcdd5137c30f5a374f6 | |
| parent | 61e7e7c5bd975cffd9e317d92d58ce02ff11d0c2 (diff) | |
| parent | 33e96c9d632ca4ce222c7d9a78d835ad45b54010 (diff) | |
| download | php-git-ef1ed6ab8eeedff5a511e027ac97a98a88fca47f.tar.gz | |
Merge branch 'PHP-7.1'
| -rw-r--r-- | Zend/zend_alloc.c | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 6f41b76376..75a66a9691 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -2299,7 +2299,7 @@ ZEND_API int is_zend_mm(void) #endif } -#if !ZEND_DEBUG && (!defined(_WIN32) || defined(__clang__)) +#if !ZEND_DEBUG && defined(HAVE_BUILTIN_CONSTANT_P) #undef _emalloc #if ZEND_MM_CUSTOM diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 657667638c..34545367cb 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1331,7 +1331,7 @@ void phpdbg_free_wrapper(void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) /* {{ */ } else { phpdbg_watch_efree(p); - return _zend_mm_free(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); + _zend_mm_free(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); } } /* }}} */ |