[x264-devel] Fix ALIGNED_ARRAY_EMU macros on ICL

[Derek Buitenhuis]

x264 | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Mon Sep 17 11:09:20 2012 -0700| [2ec8c64580efc10bbfc343d4bec2cf6bbb7d68c7] | committer: Jason Garrett-Glaser

Fix ALIGNED_ARRAY_EMU macros on ICL
ICL's preprocessor doesn't handle it correctly.
This fix is similar to libav's fix in 0db2d9.

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=2ec8c64580efc10bbfc343d4bec2cf6bbb7d68c7
---

 common/osdep.h |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/osdep.h b/common/osdep.h
index f7cad57..4d588ec 100644
--- a/common/osdep.h
+++ b/common/osdep.h
@@ -108,8 +108,10 @@
     ALIGNED_16( type name sub1 __VA_ARGS__ )
 #endif
 
-#define ALIGNED_ARRAY_32( ... ) ALIGNED_ARRAY_EMU( 31, __VA_ARGS__ )
-#define ALIGNED_ARRAY_64( ... ) ALIGNED_ARRAY_EMU( 63, __VA_ARGS__ )
+#define EXPAND(x) x
+
+#define ALIGNED_ARRAY_32( ... ) EXPAND( ALIGNED_ARRAY_EMU( 31, __VA_ARGS__ ) )
+#define ALIGNED_ARRAY_64( ... ) EXPAND( ALIGNED_ARRAY_EMU( 63, __VA_ARGS__ ) )
 
 #define UNINIT(x) x=x