Mercurial > libavutil.hg

changeset 448:41603959875e libavutil

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Disentangle nested preprocessor directives.
author diego
date Wed, 13 Feb 2008 08:08:03 +0000
parents 945e9a276df9
children f150c3ca02d5
files mem.h
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mem.h	Sat Feb 09 20:47:11 2008 +0000
+++ b/mem.h	Wed Feb 13 08:08:03 2008 +0000
@@ -26,13 +26,12 @@
 #ifndef FFMPEG_MEM_H
 #define FFMPEG_MEM_H
 
-#ifdef __GNUC__
+#ifdef __ICC
   #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
+#elif __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)))
-#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