[FFmpeg-cvslog] r16258 - in trunk/libavutil: common.h internal.h mem.h

[cehoyos]

Author: cehoyos
Date: Sun Dec 21 23:51:33 2008
New Revision: 16258

Log:
Silence the following icc warnings:
warning #1292: attribute "force_align_arg_pointer" ignored
warning #1292: attribute "alloc_size" ignored
warning #1292: attribute "cold" ignored



Modified:
   trunk/libavutil/common.h
   trunk/libavutil/internal.h
   trunk/libavutil/mem.h

Modified: trunk/libavutil/common.h
==============================================================================
--- trunk/libavutil/common.h	(original)
+++ trunk/libavutil/common.h	Sun Dec 21 23:51:33 2008
@@ -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

Modified: trunk/libavutil/internal.h
==============================================================================
--- trunk/libavutil/internal.h	(original)
+++ trunk/libavutil/internal.h	Sun Dec 21 23:51:33 2008
@@ -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

Modified: trunk/libavutil/mem.h
==============================================================================
--- trunk/libavutil/mem.h	(original)
+++ trunk/libavutil/mem.h	Sun Dec 21 23:51:33 2008
@@ -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)