From 820818a330b0918557bf8403d10bec95c9b6ace7 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Wed, 23 Mar 2011 11:30:44 +0000 Subject: 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 --- libavutil/attributes.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavutil/attributes.h') 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 -- cgit v1.2.3