Home Explore Help
Sign In
SMusatov
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Files Wiki
Browse Source

Intel C compiler 12.0 does not suport these attributes: may_alias, force_align_arg_pointer and alloc_size.

Originally committed as revision 25716 to svn://svn.ffmpeg.org/ffmpeg/trunk
Carl Eugen Hoyos 14 years ago
parent
8079d2ec08
commit
086e997e34
3 changed files with 3 additions and 3 deletions
Split View Show Diff Stats
  1. 1 1
      libavutil/attributes.h
  2. 1 1
      libavutil/internal.h
  3. 1 1
      libavutil/mem.h

+ 1 - 1
libavutil/attributes.h
View File 

@@ -97,7 +97,7 @@
 
 #endif
 
 
 #ifndef av_alias
 
-#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(3,3)
 
+#if (!defined(__ICC) || __ICC > 1200) && AV_GCC_VERSION_AT_LEAST(3,3)
 
 #   define av_alias __attribute__((may_alias))
 
 #else
 
 #   define av_alias

+ 1 - 1
libavutil/internal.h
View File 

@@ -39,7 +39,7 @@
 
 #include "timer.h"
 
 
 #ifndef attribute_align_arg
 
-#if ARCH_X86_32 && (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,2)
 
+#if ARCH_X86_32 && (!defined(__ICC) || __ICC > 1200) && AV_GCC_VERSION_AT_LEAST(4,2)
 
 #    define attribute_align_arg __attribute__((force_align_arg_pointer))
 
 #else
 
 #    define attribute_align_arg

+ 1 - 1
libavutil/mem.h
View File 

@@ -56,7 +56,7 @@
 
     #define av_malloc_attrib
 
 #endif
 
 
-#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,3)
 
+#if (!defined(__ICC) || __ICC > 1200) && AV_GCC_VERSION_AT_LEAST(4,3)
 
     #define av_alloc_size(n) __attribute__((alloc_size(n)))
 
 #else
 
     #define av_alloc_size(n)