diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-08 01:00:46 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-08 01:00:46 +0100 |
| commit | 8417a3be38f778b3c87e10f81e0d1e35a60e2200 (patch) | |
| tree | ed8abe38fc80e9ec36b9253a6041ffbec72e079d | |
| parent | bb9adc4c52a5ecc30ab4fb2831b02ab2303a8280 (diff) | |
| parent | 7a0adb4cd2ec0eef10f2ae6453c61e90b7615462 (diff) | |
| download | php-git-8417a3be38f778b3c87e10f81e0d1e35a60e2200.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | Zend/zend_portability.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h index 29b5160954..8efa651c22 100644 --- a/Zend/zend_portability.h +++ b/Zend/zend_portability.h @@ -239,11 +239,13 @@ char *alloca(); # define ZEND_FASTCALL #endif -#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3004 -#else -# define __restrict__ +#ifndef restrict +# if defined(__GNUC__) && ZEND_GCC_VERSION >= 3004 +# else +# define __restrict__ +# endif +# define restrict __restrict__ #endif -#define restrict __restrict__ #if (defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__)) || __has_attribute(noreturn) # define HAVE_NORETURN |