# HG changeset patch # User cehoyos # Date 1246091644 0 # Node ID 1091b120412ec32a5da5bf25a59ba88b01eaf929 # Parent 63e3c82b92d984875e4e12266ff118cff41e5f26 Icc 11.1 does not support attributes force_align_arg_pointer, alloc_size and cold. diff -r 63e3c82b92d9 -r 1091b120412e common.h --- a/common.h Fri Jun 12 02:13:12 2009 +0000 +++ b/common.h Sat Jun 27 08:34:04 2009 +0000 @@ -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 -r 63e3c82b92d9 -r 1091b120412e internal.h --- a/internal.h Fri Jun 12 02:13:12 2009 +0000 +++ b/internal.h Sat Jun 27 08:34:04 2009 +0000 @@ -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 -r 63e3c82b92d9 -r 1091b120412e mem.h --- a/mem.h Fri Jun 12 02:13:12 2009 +0000 +++ b/mem.h Sat Jun 27 08:34:04 2009 +0000 @@ -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)