From 21ba91ae6c361e4ce49ee65e61cc582b1af648ba Mon Sep 17 00:00:00 2001 From: Derek Buitenhuis Date: Mon, 17 Sep 2012 11:09:20 -0700 Subject: [PATCH] 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. --- common/osdep.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/osdep.h b/common/osdep.h index f7cad575..4d588ec3 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 -- 2.40.0