From 1330a8a1cb28fe1119e37f1006d3141e8dcfa65c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Thu, 21 Jan 2010 12:59:22 +0000 Subject: [PATCH] Make DECLARE_ALIGNED macros work with external array specifiers The macro implementation might need the name of the variable being declared for compiler-specific syntax. Moving array specifiers outside the macro invocation allows this to work. Originally committed as revision 21363 to svn://svn.ffmpeg.org/ffmpeg/trunk (cherry picked from commit 8a24e98d506f0f44ec58e06291fa0fce703fb6a8) Signed-off-by: Reinhard Tartler --- libavutil/internal.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavutil/internal.h b/libavutil/internal.h index f5f769e2c0..792fd29a6c 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -256,11 +256,11 @@ if((y)<(x)){\ } #if defined(__ICC) || defined(__SUNPRO_C) - #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n))) + #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v #define DECLARE_ASM_CONST(n,t,v) const t __attribute__ ((aligned (n))) v #elif defined(__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))) + #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v + #define DECLARE_ASM_CONST(n,t,v) static const t attribute_used __attribute__ ((aligned (n))) v #elif defined(_MSC_VER) #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