# HG changeset patch # User alex # Date 1179064875 0 # Node ID 0c4bf6b7d1c61d4dc9fc92746185c2c3f0da633e # Parent 8508554c43910dddc31b077467b077a61863986f use DECLARE_ALIGNED from mem.h (which is included through common.h) diff -r 8508554c4391 -r 0c4bf6b7d1c6 dsputil.h --- a/dsputil.h Sun May 13 00:26:21 2007 +0000 +++ b/dsputil.h Sun May 13 14:01:15 2007 +0000 @@ -470,11 +470,7 @@ one or more MultiMedia extension */ int mm_support(void); -#ifdef __GNUC__ - #define DECLARE_ALIGNED_16(t,v) t v __attribute__ ((aligned (16))) -#else - #define DECLARE_ALIGNED_16(t,v) __declspec(align(16)) t v -#endif +#define DECLARE_ALIGNED_16(t, v) DECLARE_ALIGNED(16, t, v) #if defined(HAVE_MMX) @@ -507,11 +503,7 @@ emms();\ } -#ifdef __GNUC__ - #define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (8))) -#else - #define DECLARE_ALIGNED_8(t,v) __declspec(align(8)) t v -#endif +#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) #define STRIDE_ALIGN 8 @@ -522,7 +514,7 @@ /* This is to use 4 bytes read to the IDCT pointers for some 'zero' line optimizations */ -#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (4))) +#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(4, t, v) #define STRIDE_ALIGN 4 #define MM_IWMMXT 0x0100 /* XScale IWMMXT */ @@ -534,7 +526,7 @@ #elif defined(HAVE_MLIB) /* SPARC/VIS IDCT needs 8-byte aligned DCT blocks */ -#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (8))) +#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) #define STRIDE_ALIGN 8 void dsputil_init_mlib(DSPContext* c, AVCodecContext *avctx); @@ -542,13 +534,13 @@ #elif defined(ARCH_SPARC) /* SPARC/VIS IDCT needs 8-byte aligned DCT blocks */ -#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (8))) +#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) #define STRIDE_ALIGN 8 void dsputil_init_vis(DSPContext* c, AVCodecContext *avctx); #elif defined(ARCH_ALPHA) -#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (8))) +#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) #define STRIDE_ALIGN 8 void dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx); @@ -565,35 +557,35 @@ #undef pixel #endif -#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (16))) +#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(16, t, v) #define STRIDE_ALIGN 16 void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx); #elif defined(HAVE_MMI) -#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (16))) +#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(16, t, v) #define STRIDE_ALIGN 16 void dsputil_init_mmi(DSPContext* c, AVCodecContext *avctx); #elif defined(ARCH_SH4) -#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (8))) +#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) #define STRIDE_ALIGN 8 void dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx); #elif defined(ARCH_BFIN) -#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (8))) +#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) #define STRIDE_ALIGN 8 void dsputil_init_bfin(DSPContext* c, AVCodecContext *avctx); #else -#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (8))) +#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) #define STRIDE_ALIGN 8 #endif