Commit 086e997e authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

Intel C compiler 12.0 does not suport these attributes: may_alias,...

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
parent 8079d2ec
......@@ -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
......
......@@ -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
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment