Fix Javaconnect build bustage

git-svn-id: svn://10.0.0.236/trunk@171862 18797224-902f-48f8-a5cc-f745e15eee43
2005-04-07 18:58:52 +00:00
parent 7a737f9d9a
commit eba175a2db
3 changed files with 3 additions and 3 deletions
--- a/mozilla/extensions/java/xpcom/Makefile.in
+++ b/mozilla/extensions/java/xpcom/Makefile.in
@@ -41,7 +41,6 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk

 MODULE		= javaxpcom
 LIBRARY_NAME	= javaxpcom
--- a/mozilla/extensions/java/xpcom/nsJavaWrapper.cpp
+++ b/mozilla/extensions/java/xpcom/nsJavaWrapper.cpp
@@ -1272,8 +1272,8 @@ GetXPCOMInstFromProxy(JNIEnv* env, jobject aJavaObject, void** aResult)
  if (!aResult)
    return NS_ERROR_NULL_POINTER;

-  long xpcom_obj = env->CallStaticIntMethod(xpcomJavaProxyClass,
-                                            getNativeXPCOMInstMID, aJavaObject);
+  long xpcom_obj = env->CallStaticLongMethod(xpcomJavaProxyClass,
+                                             getNativeXPCOMInstMID, aJavaObject);

  if (!xpcom_obj || env->ExceptionCheck()) {
    return NS_ERROR_FAILURE;