# HG changeset patch # User mru # Date 1225935208 0 # Node ID e61cc20bad68ce5460069b3b53b933a37f66bd13 # Parent 1231a7ddd932a20a4ea98b2c948721fc4dd6be80 ARM: change MUL16() macro to inline function diff -r 1231a7ddd932 -r e61cc20bad68 armv4l/mathops.h --- a/armv4l/mathops.h Thu Nov 06 01:33:26 2008 +0000 +++ b/armv4l/mathops.h Thu Nov 06 01:33:28 2008 +0000 @@ -82,10 +82,13 @@ __asm__ ("smlabb %0, %1, %2, %0" : "+r"(rt) : "r"(ra), "r"(rb)); /* signed 16x16 -> 32 multiply */ -# define MUL16(ra, rb) \ - ({ int rt; \ - __asm__ ("smulbb %0, %1, %2" : "=r" (rt) : "r" (ra), "r" (rb)); \ - rt; }) +# define MUL16 MUL16 +static inline av_const MUL16(int ra, int rb) +{ + int rt; + __asm__ ("smulbb %0, %1, %2" : "=r"(rt) : "r"(ra), "r"(rb)); + return rt; +} #endif