changeset 742:1091b120412e libavutil

Icc 11.1 does not support attributes force_align_arg_pointer, alloc_size and cold.
author cehoyos
date Sat, 27 Jun 2009 08:34:04 +0000
parents 63e3c82b92d9
children 56349e517f04
files common.h internal.h mem.h
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/common.h	Fri Jun 12 02:13:12 2009 +0000
+++ b/common.h	Sat Jun 27 08:34:04 2009 +0000
@@ -74,7 +74,7 @@
 #endif
 
 #ifndef av_cold
-#if (!defined(__ICC) || __ICC > 1100) && AV_GCC_VERSION_AT_LEAST(4,3)
+#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,3)
 #    define av_cold __attribute__((cold))
 #else
 #    define av_cold
--- a/internal.h	Fri Jun 12 02:13:12 2009 +0000
+++ b/internal.h	Sat Jun 27 08:34:04 2009 +0000
@@ -40,7 +40,7 @@
 #include "timer.h"
 
 #ifndef attribute_align_arg
-#if (!defined(__ICC) || __ICC > 1100) && AV_GCC_VERSION_AT_LEAST(4,2)
+#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,2)
 #    define attribute_align_arg __attribute__((force_align_arg_pointer))
 #else
 #    define attribute_align_arg
--- a/mem.h	Fri Jun 12 02:13:12 2009 +0000
+++ b/mem.h	Sat Jun 27 08:34:04 2009 +0000
@@ -34,7 +34,7 @@
     #define av_malloc_attrib
 #endif
 
-#if (!defined(__ICC) || __ICC > 1100) && AV_GCC_VERSION_AT_LEAST(4,3)
+#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,3)
     #define av_alloc_size(n) __attribute__((alloc_size(n)))
 #else
     #define av_alloc_size(n)