Bug 793409 - Fix bug 777292 fallout on OpenBSD/amd64 r=ehsan
authorLandry Breuil <landry@openbsd.org>
Sun, 23 Sep 2012 21:30:54 +0200
changeset 107855 d8211ef3df67c5c0aaa8b30a79133c7c09717b27
parent 107854 63643fbbde88afe83dc416d8be9c7baf1d47befd
child 107856 f52262d00c0627fa35584615738906efba50dde1
push id15243
push userlandry@openbsd.org
push dateSun, 23 Sep 2012 19:31:10 +0000
treeherdermozilla-inbound@d8211ef3df67 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs793409, 777292
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 793409 - Fix bug 777292 fallout on OpenBSD/amd64 r=ehsan
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_openbsd.cpp
--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_openbsd.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_openbsd.cpp
@@ -167,12 +167,12 @@ NS_InvokeByIndex_P(nsISupports * that, u
         "x" (d0), "x" (d1), "x" (d2), "x" (d3),
         "x" (d4), "x" (d5), "x" (d6), "x" (d7));
     
     // Get pointer to method
     uint64_t methodAddress = *((uint64_t *)that);
     methodAddress += 8 * methodIndex;
     methodAddress = *((uint64_t *)methodAddress);
     
-    typedef uint32_t (*Method)(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t);
-    uint32_t result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5);
+    typedef nsresult (*Method)(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t);
+    nsresult result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5);
     return result;
 }