From 06be9d9d8ed79d043ffaa816185e69e9f19e005e Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 27 Jun 2009 08:34:04 +0000 Subject: [PATCH] Icc 11.1 does not support attributes force_align_arg_pointer, alloc_size and cold. Originally committed as revision 19282 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavutil/common.h | 2 +- libavutil/internal.h | 2 +- libavutil/mem.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavutil/common.h b/libavutil/common.h index 11021dc880..24e900551f 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -74,7 +74,7 @@ #endif #ifndef av_cold -#if (!defined(__ICC) || __ICC > 1100) && AV_GCC_VERSION_AT_LEAST(4,3) +#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,3) # define av_cold __attribute__((cold)) #else # define av_cold diff --git a/libavutil/internal.h b/libavutil/internal.h index c9bab52e48..0ca2b4d983 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -40,7 +40,7 @@ #include "timer.h" #ifndef attribute_align_arg -#if (!defined(__ICC) || __ICC > 1100) && AV_GCC_VERSION_AT_LEAST(4,2) +#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,2) # define attribute_align_arg __attribute__((force_align_arg_pointer)) #else # define attribute_align_arg diff --git a/libavutil/mem.h b/libavutil/mem.h index 8991ee9396..fe18561e0e 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -34,7 +34,7 @@ #define av_malloc_attrib #endif -#if (!defined(__ICC) || __ICC > 1100) && AV_GCC_VERSION_AT_LEAST(4,3) +#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,3) #define av_alloc_size(n) __attribute__((alloc_size(n))) #else #define av_alloc_size(n)