[x264-devel] osdep: Use the EXPAND macro on other cases of ALIGNED_ARRAY_EMU

[Martin Storsjö]

x264 | branch: master | Martin Storsjö <martin at martin.st> | Fri Mar 24 11:33:39 2017 +0200| [64843af913e76fd7fb590e9227f678add96e8a3c] | committer: Henrik Gramner

osdep: Use the EXPAND macro on other cases of ALIGNED_ARRAY_EMU

EXPAND is already used on the other cases where ALIGNED_ARRAY_EMU
is used on all platforms (originally needed for ICL, later also
required by MSVC); apply the same change (originally from 21ba91ae)
for the cases that only are used on ARM.

This fixes use of ALIGNED_ARRAY_16 with MSVC when targeting ARM.

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

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

diff --git a/common/osdep.h b/common/osdep.h
index 95444018..3ff86fcb 100644
--- a/common/osdep.h
+++ b/common/osdep.h
@@ -125,13 +125,13 @@ int x264_is_pipe( const char *path );
     type (*name) __VA_ARGS__ = (void*)((intptr_t)(name##_u+mask) & ~mask)
 
 #if ARCH_ARM && SYS_MACOSX
-#define ALIGNED_ARRAY_8( ... ) ALIGNED_ARRAY_EMU( 7, __VA_ARGS__ )
+#define ALIGNED_ARRAY_8( ... ) EXPAND( ALIGNED_ARRAY_EMU( 7, __VA_ARGS__ ) )
 #else
 #define ALIGNED_ARRAY_8( type, name, sub1, ... ) ALIGNED_8( type name sub1 __VA_ARGS__ )
 #endif
 
 #if ARCH_ARM
-#define ALIGNED_ARRAY_16( ... ) ALIGNED_ARRAY_EMU( 15, __VA_ARGS__ )
+#define ALIGNED_ARRAY_16( ... ) EXPAND( ALIGNED_ARRAY_EMU( 15, __VA_ARGS__ ) )
 #else
 #define ALIGNED_ARRAY_16( type, name, sub1, ... ) ALIGNED_16( type name sub1 __VA_ARGS__ )
 #endif