Commit 06be9d9d authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

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
parent d2667090
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
#endif #endif
#ifndef av_cold #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)) # define av_cold __attribute__((cold))
#else #else
# define av_cold # define av_cold
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "timer.h" #include "timer.h"
#ifndef attribute_align_arg #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)) # define attribute_align_arg __attribute__((force_align_arg_pointer))
#else #else
# define attribute_align_arg # define attribute_align_arg
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#define av_malloc_attrib #define av_malloc_attrib
#endif #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))) #define av_alloc_size(n) __attribute__((alloc_size(n)))
#else #else
#define av_alloc_size(n) #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