aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-01-21 12:59:22 +0000
committerReinhard Tartler <siretart@tauware.de>2011-11-05 11:29:12 +0100
commit1330a8a1cb28fe1119e37f1006d3141e8dcfa65c (patch)
tree883506fceacee804d19c1ea571052a302d475c11
parent8135c3552894b096a9f9989dc310ece7bb529403 (diff)
downloadffmpeg-1330a8a1cb28fe1119e37f1006d3141e8dcfa65c.tar.gz
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 <siretart@tauware.de>
-rw-r--r--libavutil/internal.h6
1 files 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