Disentangle nested preprocessor directives.

Originally committed as revision 11917 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavutil/mem.h

@@ -26,13 +26,12 @@
 #ifndef FFMPEG_MEM_H
 #define FFMPEG_MEM_H
 
-#ifdef __GNUC__
-  #define DECLARE_ALIGNED(n,t,v)       t v __attribute__ ((aligned (n)))
 #ifdef __ICC
+  #define DECLARE_ALIGNED(n,t,v)       t v __attribute__ ((aligned (n)))
   #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