diff options
author | Nikita Popov <nikic@php.net> | 2016-12-14 18:10:36 +0100 |
---|---|---|
committer | Nikita Popov <nikic@php.net> | 2016-12-14 18:11:27 +0100 |
commit | f99bf7036033f4dd95b8f56c8697af7f8963ab9f (patch) | |
tree | e21fd21c4f2dc3a3b543dc5cedda14a9a7107e68 /Zend/zend_alloc.c | |
parent | d663296e3bb5501f15c395990d11c49acf03ef8d (diff) | |
download | php-git-f99bf7036033f4dd95b8f56c8697af7f8963ab9f.tar.gz |
Partially fix bug #70492
The libmagic portion is missing.
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 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 |