From 4ce9492339b2313fcc52b7d572b6e167fe6b8c11 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Sun, 25 Jan 2009 19:18:56 +0000
Subject: [PATCH] Move DECLARE_ALIGNED and DECLARE_ASM_CONST to internal.h.
Their definition depends on preprocessor directives from config.h, thus they
cannot be declared in a public header since public headers cannot #include
config.h.
Originally committed as revision 16781 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavutil/internal.h | 17 +++++++++++++++++
libavutil/mem.h | 17 -----------------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/libavutil/internal.h b/libavutil/internal.h
index c1f849fb3f0..3c03bfbf799 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -258,6 +258,23 @@ if((y)<(x)){\
}\
}
+#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
+#elif HAVE_INLINE_ASM
+ #error The asm code needs alignment, but we do not know how to do it for this compiler.
+#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 --git a/libavutil/mem.h b/libavutil/mem.h
index 19d15f0af35..7ce61631db2 100644
--- a/libavutil/mem.h
+++ b/libavutil/mem.h
@@ -26,25 +26,8 @@
#ifndef AVUTIL_MEM_H
#define AVUTIL_MEM_H
-#include "config.h"
#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
-#elif HAVE_INLINE_ASM
- #error The asm code needs alignment, but we do not know how to do it for this compiler.
-#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
--
GitLab