From: dreamsxin <dreamsxin@qq.com>
Date: Tue, 7 Feb 2017 03:36:22 +0000 (+0800)
Subject: Add #ifndef restrict
X-Git-Tag: php-7.0.17RC1~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a0adb4cd2ec0eef10f2ae6453c61e90b7615462;p=php

Add #ifndef restrict
---

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