summaryrefslogtreecommitdiff
path: root/libavutil/attributes.h
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-03-23 11:30:44 +0000
committerMans Rullgard <mans@mansr.com>2011-03-23 12:39:58 +0000
commit820818a330b0918557bf8403d10bec95c9b6ace7 (patch)
treed6d9202786d8cbb0405213ba56db770bd57322a5 /libavutil/attributes.h
parent91bcad197175bf82610ea52498854b5b0ed73de0 (diff)
Remove unnecessary icc version checks
With unknown attribute warnings disabled, these checks are no longer needed. Removing them improves readability while having no effect on generated code. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavutil/attributes.h')
-rw-r--r--libavutil/attributes.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/attributes.h b/libavutil/attributes.h
index 4ee0dde01a..4abe78f3bf 100644
--- a/libavutil/attributes.h
+++ b/libavutil/attributes.h
@@ -65,7 +65,7 @@
#endif
#ifndef av_cold
-#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,3)
+#if AV_GCC_VERSION_AT_LEAST(4,3)
# define av_cold __attribute__((cold))
#else
# define av_cold
@@ -73,7 +73,7 @@
#endif
#ifndef av_flatten
-#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,1)
+#if AV_GCC_VERSION_AT_LEAST(4,1)
# define av_flatten __attribute__((flatten))
#else
# define av_flatten
@@ -110,7 +110,7 @@
#endif
#ifndef av_alias
-#if (!defined(__ICC) || __ICC > 1200) && AV_GCC_VERSION_AT_LEAST(3,3)
+#if AV_GCC_VERSION_AT_LEAST(3,3)
# define av_alias __attribute__((may_alias))
#else
# define av_alias