Revision a5b13b14

View differences:

libavutil/attributes.h
65 65
#endif
66 66

  
67 67
#ifndef av_cold
68
#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,3)
68
#if (!defined(__INTEL_COMPILER) || __INTEL_COMPILER > 1110) && AV_GCC_VERSION_AT_LEAST(4,3)
69 69
#    define av_cold __attribute__((cold))
70 70
#else
71 71
#    define av_cold
......
73 73
#endif
74 74

  
75 75
#ifndef av_flatten
76
#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,1)
76
#if (!defined(__INTEL_COMPILER) || __INTEL_COMPILER > 1110) && AV_GCC_VERSION_AT_LEAST(4,1)
77 77
#    define av_flatten __attribute__((flatten))
78 78
#else
79 79
#    define av_flatten
......
110 110
#endif
111 111

  
112 112
#ifndef av_alias
113
#if (!defined(__ICC) || __ICC > 1200) && AV_GCC_VERSION_AT_LEAST(3,3)
113
#if (!defined(__INTEL_COMPILER) || __INTEL_COMPILER > 1200) && AV_GCC_VERSION_AT_LEAST(3,3)
114 114
#   define av_alias __attribute__((may_alias))
115 115
#else
116 116
#   define av_alias
......
118 118
#endif
119 119

  
120 120
#ifndef av_uninit
121
#if defined(__GNUC__) && !defined(__ICC)
121
#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
122 122
#    define av_uninit(x) x=x
123 123
#else
124 124
#    define av_uninit(x) x
libavutil/internal.h
39 39
#include "timer.h"
40 40

  
41 41
#ifndef attribute_align_arg
42
#if ARCH_X86_32 && (!defined(__ICC) || __ICC > 1200) && AV_GCC_VERSION_AT_LEAST(4,2)
42
#if ARCH_X86_32 && (!defined(__INTEL_COMPILER) || __INTEL_COMPILER > 1200) && AV_GCC_VERSION_AT_LEAST(4,2)
43 43
#    define attribute_align_arg __attribute__((force_align_arg_pointer))
44 44
#else
45 45
#    define attribute_align_arg
libavutil/mem.h
29 29
#include "attributes.h"
30 30
#include "avutil.h"
31 31

  
32
#if defined(__ICC) && _ICC < 1200 || defined(__SUNPRO_C)
32
#if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1200 || defined(__SUNPRO_C)
33 33
    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
34 34
    #define DECLARE_ASM_CONST(n,t,v)    const t __attribute__ ((aligned (n))) v
35 35
#elif defined(__TI_COMPILER_VERSION__)
......
56 56
    #define av_malloc_attrib
57 57
#endif
58 58

  
59
#if (!defined(__ICC) || __ICC > 1200) && AV_GCC_VERSION_AT_LEAST(4,3)
59
#if (!defined(__INTEL_COMPILER) || __INTEL_COMPILER > 1200) && AV_GCC_VERSION_AT_LEAST(4,3)
60 60
    #define av_alloc_size(n) __attribute__((alloc_size(n)))
61 61
#else
62 62
    #define av_alloc_size(n)

Also available in: Unified diff