# HG changeset patch # User ramiro # Date 1247106029 0 # Node ID 3b90ae5577ad17d295d199f9a7d2598dbd4d4468 # Parent 59c9e9a0bc0a43cba4da0fe9d3e31256fa65428f Move DECLARE_ALIGNED and DECLARE_ASM_CONST back from lavu/internal.h to lavu/mem.h. diff -r 59c9e9a0bc0a -r 3b90ae5577ad internal.h --- a/internal.h Thu Jul 09 02:18:29 2009 +0000 +++ b/internal.h Thu Jul 09 02:20:29 2009 +0000 @@ -258,21 +258,6 @@ }\ } -#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 -#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))) -#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 -#else - #define DECLARE_ALIGNED(n,t,v) t v - #define DECLARE_ASM_CONST(n,t,v) static const t v -#endif - - #if !HAVE_LLRINT static av_always_inline av_const long long llrint(double x) { diff -r 59c9e9a0bc0a -r 3b90ae5577ad mem.h --- a/mem.h Thu Jul 09 02:18:29 2009 +0000 +++ b/mem.h Thu Jul 09 02:20:29 2009 +0000 @@ -28,6 +28,21 @@ #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 +#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))) +#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 +#else + #define DECLARE_ALIGNED(n,t,v) t v + #define DECLARE_ASM_CONST(n,t,v) static const t v +#endif + + #if AV_GCC_VERSION_AT_LEAST(3,1) #define av_malloc_attrib __attribute__((__malloc__)) #else