summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordreamsxin <dreamsxin@qq.com>2017-02-07 11:36:22 +0800
committerNikita Popov <nikita.ppv@gmail.com>2017-02-08 01:00:35 +0100
commit7a0adb4cd2ec0eef10f2ae6453c61e90b7615462 (patch)
tree26bd76e9d977498ead3d69e244d7b7d47d5d08b4
parent714d825b62e719447686da6efe3b4063c2f25749 (diff)
downloadphp-git-7a0adb4cd2ec0eef10f2ae6453c61e90b7615462.tar.gz
Add #ifndef restrict
-rw-r--r--Zend/zend_portability.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h
index c1e17c30f2..cce55b71b2 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