Bug 434503 - "m68k xptcstubs/xptcinvoke fail to build on trunk" [r=bsmedberg]

xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_m68k.cpp

@@ -128,8 +128,8 @@ extern "C" {
     }
 }
 
-XPTC_PUBLIC_API(nsresult)
-XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+EXPORT_XPCOM_API(nsresult)
+NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
                    PRUint32 paramCount, nsXPTCVariant* params)
 {
     PRUint32 result, n;

xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp

@@ -38,6 +38,7 @@
 /* Implement shared vtbl methods. */
 
 #include "xptcprivate.h"
+#include "xptiprivate.h"
 
 extern "C" {
     nsresult
@@ -47,7 +48,6 @@ extern "C" {
 
         nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
         nsXPTCMiniVariant* dispatchParams = NULL;
-        nsIInterfaceInfo* iface_info = NULL;
         const nsXPTMethodInfo* info;
         PRUint8 paramCount;
         PRUint8 i;
@@ -55,11 +55,8 @@ extern "C" {
 
         NS_ASSERTION(self,"no self");
 
-        self->GetInterfaceInfo(&iface_info);
-        NS_ASSERTION(iface_info,"no interface info");
-
-        iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-        NS_ASSERTION(info,"no interface info");
+        self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info);
+        NS_ASSERTION(info,"no method info");
 
         paramCount = info->GetParamCount();
 
@@ -107,9 +104,7 @@ extern "C" {
             }
         }
 
-        result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-
-        NS_RELEASE(iface_info);
+        result = self->mOuter->CallMethod((PRUint16)methodIndex, info, dispatchParams);
 
         if(dispatchParams != paramBuffer)
             delete [] dispatchParams;