# HG changeset patch
# User diego
# Date 1202890083 0
# Node ID 41603959875e9ceffad192b0f2b37e958e3e9605
# Parent  945e9a276df965c4228e73b61e732eb07a7af82d
Disentangle nested preprocessor directives.

diff -r 945e9a276df9 -r 41603959875e mem.h
--- 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