diff options
| -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 937340d9c9..be82854e70 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -2343,7 +2343,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 7eeaf48d79..9cc60286c5 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1300,7 +1300,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); } } /* }}} */ |