summaryrefslogtreecommitdiff
path: root/libavutil/common.h
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2008-12-21 22:51:33 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2008-12-21 22:51:33 +0000
commitaf4c0bcb6ed6f3d679dddfe9c4fd4f73f84fcabc (patch)
tree8beda6b11d9eaebe1e7dd35fa3583d7ab9ac8045 /libavutil/common.h
parent1af34f094e2e28c26effbf42adf9479a8b759069 (diff)
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
Diffstat (limited to 'libavutil/common.h')
-rw-r--r--libavutil/common.h2
1 files changed, 1 insertions, 1 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