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.

diff --git a/common/osdep.h b/common/osdep.h
index f7cad575958353f0d1c93d49276d8341c86b6c05..4d588ec301b478454b8ced4f4f354e120b07edea 100644 (file)
--- 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