changeset 591:5fe37f8a1017 libavutil

Silence the following icc warnings: warning #1292: attribute "force_align_arg_pointer" ignored warning #1292: attribute "alloc_size" ignored warning #1292: attribute "cold" ignored
author cehoyos
date Sun, 21 Dec 2008 22:51:33 +0000
parents e9d89a89561a
children 0a8fe912f5a0
files common.h internal.h mem.h
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/common.h	Sat Dec 20 17:33:35 2008 +0000
+++ b/common.h	Sun Dec 21 22:51:33 2008 +0000
@@ -76,7 +76,7 @@
 #endif
 
 #ifndef av_cold
-#if AV_GCC_VERSION_AT_LEAST(4,3)
+#if (!defined(__ICC) || __ICC > 1100) && AV_GCC_VERSION_AT_LEAST(4,3)
 #    define av_cold __attribute__((cold))
 #else
 #    define av_cold
--- a/internal.h	Sat Dec 20 17:33:35 2008 +0000
+++ b/internal.h	Sun Dec 21 22:51:33 2008 +0000
@@ -36,7 +36,7 @@
 #include "common.h"
 
 #ifndef attribute_align_arg
-#if AV_GCC_VERSION_AT_LEAST(4,2)
+#if (!defined(__ICC) || __ICC > 1100) && AV_GCC_VERSION_AT_LEAST(4,2)
 #    define attribute_align_arg __attribute__((force_align_arg_pointer))
 #else
 #    define attribute_align_arg
--- a/mem.h	Sat Dec 20 17:33:35 2008 +0000
+++ b/mem.h	Sun Dec 21 22:51:33 2008 +0000
@@ -50,7 +50,7 @@
     #define av_malloc_attrib
 #endif
 
-#if AV_GCC_VERSION_AT_LEAST(4,3)
+#if (!defined(__ICC) || __ICC > 1100) && AV_GCC_VERSION_AT_LEAST(4,3)
     #define av_alloc_size(n) __attribute__((alloc_size(n)))
 #else
     #define av_alloc_size(n)