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/mem.h | |
| parent | 541e8f3beccbe806599e9af4902d1e68b4367b80 (diff) | |
| download | ffmpeg-52476c1beeafbb31e3277e950ec175444ece05af.tar.gz | |
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/mem.h')
| -rw-r--r-- | libavutil/mem.h | 6 |
1 files changed, 4 insertions, 2 deletions
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) |