From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 12 Jun 2019 12:29:23 +0000 (+0200)
Subject: Make ATTRIBUTE_UNUSED more portable
X-Git-Tag: php-7.4.0alpha2~119^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f63e7e324c84319919f0f87eaa2505c5c4f512d;p=php

Make ATTRIBUTE_UNUSED more portable
---

diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h
index 009be97d96..aae08a49c1 100644
--- a/Zend/zend_portability.h
+++ b/Zend/zend_portability.h
@@ -217,8 +217,13 @@ char *alloca();
 # define ZEND_ATTRIBUTE_DEPRECATED
 #endif
 
-#if defined(__GNUC__) && ZEND_GCC_VERSION >= 4003
+#if ZEND_GCC_VERSION >= 4003 || __has_attribute(unused)
 # define ZEND_ATTRIBUTE_UNUSED __attribute__((unused))
+#else
+# define ZEND_ATTRIBUTE_UNUSED
+#endif
+
+#if defined(__GNUC__) && ZEND_GCC_VERSION >= 4003
 # define ZEND_COLD __attribute__((cold))
 # define ZEND_HOT __attribute__((hot))
 # ifdef __OPTIMIZE__
@@ -229,7 +234,6 @@ char *alloca();
 #  define ZEND_OPT_SPEED
 # endif
 #else
-# define ZEND_ATTRIBUTE_UNUSED
 # define ZEND_COLD
 # define ZEND_HOT
 # define ZEND_OPT_SIZE