summaryrefslogtreecommitdiff
path: root/libavutil/mem.h
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2008-02-09 20:47:11 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2008-02-09 20:47:11 +0000
commit7ce3e4a882318424f5163e2c62bfb3fb2fe9391c (patch)
tree47c496f533abb9c014f6aeea7edef0af84f845d3 /libavutil/mem.h
parentc4c52acc369656754e217cf0740643eed16f5c35 (diff)
Allow compilation with icc 10.1.
Originally committed as revision 11889 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/mem.h')
-rw-r--r--libavutil/mem.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavutil/mem.h b/libavutil/mem.h
index b9ff44d4f1..3c7284dd00 100644
--- a/libavutil/mem.h
+++ b/libavutil/mem.h
@@ -28,7 +28,11 @@
#ifdef __GNUC__
#define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n)))
+#ifdef __ICC
+ #define DECLARE_ASM_CONST(n,t,v) const t __attribute__ ((aligned (n))) v
+#else
#define DECLARE_ASM_CONST(n,t,v) static const t v attribute_used __attribute__ ((aligned (n)))
+#endif
#else
#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