Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-03-02 15:38:21 +0300
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-03-02 15:38:21 +0300
commita5b13b1423ec20c40bdf44454c12289a845ef317 (patch)
tree0ea445a0f37259e2ecd65939c87403f4db039b55 /libavutil/mem.h
parent42ccd2fcf834db379834d39b4012cbe18152dfe4 (diff)
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/mem.h')
-rw-r--r--libavutil/mem.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/mem.h b/libavutil/mem.h
index 33ab48f895..4842c36dc8 100644
--- a/libavutil/mem.h
+++ b/libavutil/mem.h
@@ -29,7 +29,7 @@
#include "attributes.h"
#include "avutil.h"
-#if defined(__ICC) && _ICC < 1200 || defined(__SUNPRO_C)
+#if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1200 || defined(__SUNPRO_C)
#define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v
#define DECLARE_ASM_CONST(n,t,v) const t __attribute__ ((aligned (n))) v
#elif defined(__TI_COMPILER_VERSION__)
@@ -56,7 +56,7 @@
#define av_malloc_attrib
#endif
-#if (!defined(__ICC) || __ICC > 1200) && AV_GCC_VERSION_AT_LEAST(4,3)
+#if (!defined(__INTEL_COMPILER) || __INTEL_COMPILER > 1200) && AV_GCC_VERSION_AT_LEAST(4,3)
#define av_alloc_size(n) __attribute__((alloc_size(n)))
#else
#define av_alloc_size(n)