summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-06-12 14:29:23 +0200
committerNikita Popov <nikita.ppv@gmail.com>2019-06-12 14:29:23 +0200
commit8f63e7e324c84319919f0f87eaa2505c5c4f512d (patch)
tree439f7f91143461034f50dda32ee36d19fb16a910
parentcc89d260968746f1048029d711f113d2a9688a13 (diff)
downloadphp-git-8f63e7e324c84319919f0f87eaa2505c5c4f512d.tar.gz
Make ATTRIBUTE_UNUSED more portable
-rw-r--r--Zend/zend_portability.h8
1 files changed, 6 insertions, 2 deletions
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