From 52476c1beeafbb31e3277e950ec175444ece05af Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 20 Dec 2008 17:33:35 +0000 Subject: Use AV_GCC_VERSION_AT_LEAST() to simplify gcc version checks. Originally committed as revision 16246 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavutil/mem.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libavutil/mem.h') 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) -- cgit v1.2.3