From: Måns Rullgård <mans@mansr.com>
Date: Thu, 6 Nov 2008 01:33:23 +0000 (+0000)
Subject: ARM: change MULH() macro to inline function
X-Git-Tag: v0.5~2016
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=73c1c96b8343bff0cbe69a08ef5403de3983fb68;p=platform%2Fupstream%2Flibav.git

ARM: change MULH() macro to inline function

Originally committed as revision 15781 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/armv4l/mathops.h b/libavcodec/armv4l/mathops.h
index c30ab33..9f3076b 100644
--- a/libavcodec/armv4l/mathops.h
+++ b/libavcodec/armv4l/mathops.h
@@ -39,6 +39,7 @@ static inline av_const int MULL(int a, int b)
 }
 #endif
 
+#define MULH MULH
 #ifdef HAVE_ARMV6
 static inline av_const int MULH(int a, int b)
 {
@@ -46,12 +47,13 @@ static inline av_const int MULH(int a, int b)
     __asm__ ("smmul %0, %1, %2" : "=r"(r) : "r"(a), "r"(b));
     return r;
 }
-#define MULH MULH
 #else
-#define MULH(a, b) \
-    ({ int lo, hi;\
-     __asm__ ("smull %0, %1, %2, %3" : "=&r"(lo), "=&r"(hi) : "r"(b), "r"(a));\
-     hi; })
+static inline av_const int MULH(int a, int b)
+{
+    int lo, hi;
+    __asm__ ("smull %0, %1, %2, %3" : "=&r"(lo), "=&r"(hi) : "r"(b), "r"(a));
+    return hi;
+}
 #endif
 
 static inline av_const int64_t MUL64(int a, int b)