diff options
| author | Nikita Popov <nikic@php.net> | 2016-12-14 18:11:43 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-12-14 18:11:43 +0100 |
| commit | 33e96c9d632ca4ce222c7d9a78d835ad45b54010 (patch) | |
| tree | da8e8b53d45559ebeac581dba251c66cd9b71b2f /Zend/zend_alloc.c | |
| parent | 2f438342ecef4efd207becddf9cea46d0d3a2f00 (diff) | |
| parent | f99bf7036033f4dd95b8f56c8697af7f8963ab9f (diff) | |
| download | php-git-33e96c9d632ca4ce222c7d9a78d835ad45b54010.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index a3003a457a..aa02fe6764 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 |