diff options
| author | Carl Eugen Hoyos | 2010-11-10 12:45:41 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos | 2010-11-10 12:45:41 +0000 |
| commit | 086e997e34d05b27804a8521791399ecccd76011 (patch) | |
| tree | 6df5cf6d9d2a2d9e35093efb7e1a85e00f5716ba /libavutil | |
| parent | 8079d2ec088ceed7773c004953f9870262358bed (diff) | |
Intel C compiler 12.0 does not suport these attributes: may_alias, force_align_arg_pointer and alloc_size.
Originally committed as revision 25716 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/attributes.h | 2 | ||||
| -rw-r--r-- | libavutil/internal.h | 2 | ||||
| -rw-r--r-- | libavutil/mem.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/attributes.h b/libavutil/attributes.h index a95bb02e89..d93f46093c 100644 --- a/libavutil/attributes.h +++ b/libavutil/attributes.h @@ -97,7 +97,7 @@ #endif #ifndef av_alias -#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(3,3) +#if (!defined(__ICC) || __ICC > 1200) && AV_GCC_VERSION_AT_LEAST(3,3) # define av_alias __attribute__((may_alias)) #else # define av_alias diff --git a/libavutil/internal.h b/libavutil/internal.h index 53d2b94c50..9c4ba7e60c 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -39,7 +39,7 @@ #include "timer.h" #ifndef attribute_align_arg -#if ARCH_X86_32 && (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,2) +#if ARCH_X86_32 && (!defined(__ICC) || __ICC > 1200) && 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 c5ec2ab3c3..1ec8eb8601 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -56,7 +56,7 @@ #define av_malloc_attrib #endif -#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,3) +#if (!defined(__ICC) || __ICC > 1200) && AV_GCC_VERSION_AT_LEAST(4,3) #define av_alloc_size(n) __attribute__((alloc_size(n))) #else #define av_alloc_size(n) |