From 7433ca29825c88a0c30a0e8e00ecb32fa3f04fa1 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 13 Feb 2008 08:08:03 +0000 Subject: [PATCH] Disentangle nested preprocessor directives. Originally committed as revision 11917 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavutil/mem.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavutil/mem.h b/libavutil/mem.h index 3c7284dd0..84b7728b4 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -26,13 +26,12 @@ #ifndef FFMPEG_MEM_H #define FFMPEG_MEM_H -#ifdef __GNUC__ - #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n))) #ifdef __ICC + #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n))) #define DECLARE_ASM_CONST(n,t,v) const t __attribute__ ((aligned (n))) v -#else +#elif __GNUC__ + #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n))) #define DECLARE_ASM_CONST(n,t,v) static const t v attribute_used __attribute__ ((aligned (n))) -#endif #else #define DECLARE_ALIGNED(n,t,v) __declspec(align(n)) t v #define DECLARE_ASM_CONST(n,t,v) __declspec(align(n)) static const t v -- 2.34.1