Mercurial > libavutil.hg
changeset 590:e9d89a89561a libavutil
Use AV_GCC_VERSION_AT_LEAST() to simplify gcc version checks.
| author | cehoyos |
|---|---|
| date | Sat, 20 Dec 2008 17:33:35 +0000 |
| parents | 9dd4312d8a4d |
| children | 5fe37f8a1017 |
| files | common.h internal.h mem.h |
| diffstat | 3 files changed, 15 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/common.h Wed Dec 17 20:04:39 2008 +0000 +++ b/common.h Sat Dec 20 17:33:35 2008 +0000 @@ -41,8 +41,10 @@ # include <math.h> #endif /* HAVE_AV_CONFIG_H */ +#define AV_GCC_VERSION_AT_LEAST(x,y) (defined(__GNUC__) && (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y)) + #ifndef av_always_inline -#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) +#if AV_GCC_VERSION_AT_LEAST(3,1) # define av_always_inline __attribute__((always_inline)) inline #else # define av_always_inline inline @@ -50,7 +52,7 @@ #endif #ifndef av_noinline -#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) +#if AV_GCC_VERSION_AT_LEAST(3,1) # define av_noinline __attribute__((noinline)) #else # define av_noinline @@ -58,7 +60,7 @@ #endif #ifndef av_pure -#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) +#if AV_GCC_VERSION_AT_LEAST(3,1) # define av_pure __attribute__((pure)) #else # define av_pure @@ -66,7 +68,7 @@ #endif #ifndef av_const -#if defined(__GNUC__) && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ > 5) +#if AV_GCC_VERSION_AT_LEAST(2,6) # define av_const __attribute__((const)) #else # define av_const @@ -74,7 +76,7 @@ #endif #ifndef av_cold -#if defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 2) +#if AV_GCC_VERSION_AT_LEAST(4,3) # define av_cold __attribute__((cold)) #else # define av_cold @@ -86,7 +88,7 @@ #endif /* HAVE_AV_CONFIG_H */ #ifndef attribute_deprecated -#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) +#if AV_GCC_VERSION_AT_LEAST(3,1) # define attribute_deprecated __attribute__((deprecated)) #else # define attribute_deprecated
--- a/internal.h Wed Dec 17 20:04:39 2008 +0000 +++ b/internal.h Sat Dec 20 17:33:35 2008 +0000 @@ -33,9 +33,10 @@ #include <stdint.h> #include <stddef.h> #include <assert.h> +#include "common.h" #ifndef attribute_align_arg -#if defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__>1) +#if AV_GCC_VERSION_AT_LEAST(4,2) # define attribute_align_arg __attribute__((force_align_arg_pointer)) #else # define attribute_align_arg @@ -43,7 +44,7 @@ #endif #ifndef attribute_used -#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) +#if AV_GCC_VERSION_AT_LEAST(3,1) # define attribute_used __attribute__((used)) #else # define attribute_used
--- a/mem.h Wed Dec 17 20:04:39 2008 +0000 +++ b/mem.h Sat Dec 20 17:33:35 2008 +0000 @@ -26,6 +26,8 @@ #ifndef AVUTIL_MEM_H #define AVUTIL_MEM_H +#include "common.h" + #if defined(__ICC) || defined(__SUNPRO_C) #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n))) #define DECLARE_ASM_CONST(n,t,v) const t __attribute__ ((aligned (n))) v @@ -42,13 +44,13 @@ #define DECLARE_ASM_CONST(n,t,v) static const t v #endif -#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) +#if AV_GCC_VERSION_AT_LEAST(3,1) #define av_malloc_attrib __attribute__((__malloc__)) #else #define av_malloc_attrib #endif -#if defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 2) +#if AV_GCC_VERSION_AT_LEAST(4,3) #define av_alloc_size(n) __attribute__((alloc_size(n))) #else #define av_alloc_size(n)