aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/attributes.h
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-03-02 13:38:21 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-03-02 13:38:21 +0100
commita5b13b1423ec20c40bdf44454c12289a845ef317 (patch)
tree0ea445a0f37259e2ecd65939c87403f4db039b55 /libavutil/attributes.h
parent42ccd2fcf834db379834d39b4012cbe18152dfe4 (diff)
downloadffmpeg-a5b13b1423ec20c40bdf44454c12289a845ef317.tar.gz
Use macro __INTEL_COMPILER instead of __ICC.
__ICC is not supported on all platforms, this is an Intel documentation bug that is supposed to be fixed in a future release. (Intel issue 612289)
Diffstat (limited to 'libavutil/attributes.h')
-rw-r--r--libavutil/attributes.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/attributes.h b/libavutil/attributes.h
index 65a9249cd5..1a6024416e 100644
--- a/libavutil/attributes.h
+++ b/libavutil/attributes.h
@@ -65,7 +65,7 @@
#endif
#ifndef av_cold
-#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,3)
+#if (!defined(__INTEL_COMPILER) || __INTEL_COMPILER > 1110) && AV_GCC_VERSION_AT_LEAST(4,3)
# define av_cold __attribute__((cold))
#else
# define av_cold
@@ -73,7 +73,7 @@
#endif
#ifndef av_flatten
-#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,1)
+#if (!defined(__INTEL_COMPILER) || __INTEL_COMPILER > 1110) && AV_GCC_VERSION_AT_LEAST(4,1)
# define av_flatten __attribute__((flatten))
#else
# define av_flatten
@@ -110,7 +110,7 @@
#endif
#ifndef av_alias
-#if (!defined(__ICC) || __ICC > 1200) && AV_GCC_VERSION_AT_LEAST(3,3)
+#if (!defined(__INTEL_COMPILER) || __INTEL_COMPILER > 1200) && AV_GCC_VERSION_AT_LEAST(3,3)
# define av_alias __attribute__((may_alias))
#else
# define av_alias
@@ -118,7 +118,7 @@
#endif
#ifndef av_uninit
-#if defined(__GNUC__) && !defined(__ICC)
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
# define av_uninit(x) x=x
#else
# define av_uninit(x) x