virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Remove unnecessary icc version checks

Browse Source 
With unknown attribute warnings disabled, these checks are no
longer needed.  Removing them improves readability while having
no effect on generated code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Mans Rullgard
2011-03-23 11:30:44 +00:00
parent 91bcad1971
commit 820818a330
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavutil/attributes.h
View File

@@ -65,7 +65,7 @@
#endif #endif
#ifndef av_cold #ifndef av_cold
#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,3) #if AV_GCC_VERSION_AT_LEAST(4,3)
# define av_cold __attribute__((cold)) # define av_cold __attribute__((cold))
#else #else
# define av_cold # define av_cold
@@ -73,7 +73,7 @@
#endif #endif
#ifndef av_flatten #ifndef av_flatten
#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,1) #if AV_GCC_VERSION_AT_LEAST(4,1)
# define av_flatten __attribute__((flatten)) # define av_flatten __attribute__((flatten))
#else #else
# define av_flatten # define av_flatten
@@ -110,7 +110,7 @@
#endif #endif
#ifndef av_alias #ifndef av_alias
#if (!defined(__ICC) || __ICC > 1200) && AV_GCC_VERSION_AT_LEAST(3,3) #if AV_GCC_VERSION_AT_LEAST(3,3)
# define av_alias __attribute__((may_alias)) # define av_alias __attribute__((may_alias))
#else #else
# define av_alias # define av_alias

2
libavutil/internal.h
View File

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

2
libavutil/mem.h
View File

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