diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-12-20 17:33:35 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-12-20 17:33:35 +0000 |
| commit | 52476c1beeafbb31e3277e950ec175444ece05af (patch) | |
| tree | b562f8925e9611e837f7eed9921d98e2fcbc49d0 /libavutil | |
| parent | 541e8f3beccbe806599e9af4902d1e68b4367b80 (diff) | |
Use AV_GCC_VERSION_AT_LEAST() to simplify gcc version checks.
Originally committed as revision 16246 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/common.h | 14 | ||||
| -rw-r--r-- | libavutil/internal.h | 5 | ||||
| -rw-r--r-- | libavutil/mem.h | 6 |
3 files changed, 15 insertions, 10 deletions
diff --git a/libavutil/common.h b/libavutil/common.h index cd43abd065..83ced2d6fd 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -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 diff --git a/libavutil/internal.h b/libavutil/internal.h index 535791a523..9d029dd97a 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -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 diff --git a/libavutil/mem.h b/libavutil/mem.h index a02c7e150e..cfe7c53c58 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -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) |