summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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