diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-12-21 22:51:33 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-12-21 22:51:33 +0000 |
| commit | af4c0bcb6ed6f3d679dddfe9c4fd4f73f84fcabc (patch) | |
| tree | 8beda6b11d9eaebe1e7dd35fa3583d7ab9ac8045 | |
| parent | 1af34f094e2e28c26effbf42adf9479a8b759069 (diff) | |
| download | ffmpeg-af4c0bcb6ed6f3d679dddfe9c4fd4f73f84fcabc.tar.gz | |
Silence the following icc warnings:
warning #1292: attribute "force_align_arg_pointer" ignored
warning #1292: attribute "alloc_size" ignored
warning #1292: attribute "cold" ignored
Originally committed as revision 16258 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavutil/common.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/common.h b/libavutil/common.h index 83ced2d6fd..7185a8b03c 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -76,7 +76,7 @@ #endif #ifndef av_cold -#if AV_GCC_VERSION_AT_LEAST(4,3) +#if (!defined(__ICC) || __ICC > 1100) && 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 9d029dd97a..251cc33b00 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -36,7 +36,7 @@ #include "common.h" #ifndef attribute_align_arg -#if AV_GCC_VERSION_AT_LEAST(4,2) +#if (!defined(__ICC) || __ICC > 1100) && 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 cfe7c53c58..3ea9858236 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -50,7 +50,7 @@ #define av_malloc_attrib #endif -#if AV_GCC_VERSION_AT_LEAST(4,3) +#if (!defined(__ICC) || __ICC > 1100) && AV_GCC_VERSION_AT_LEAST(4,3) #define av_alloc_size(n) __attribute__((alloc_size(n))) #else #define av_alloc_size(n) |