Fix Javaconnect build bustage

2025-01-26 06:38:36 +00:00 · 2005-04-07 18:58:52 +00:00 · 2005-04-07 18:58:52 +00:00 · e879274019
commit e879274019
parent cf07e1ad5c
3 changed files with 3 additions and 3 deletions
--- a/extensions/java/xpcom/Makefile.in
+++ b/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/extensions/java/xpcom/nsJavaWrapper.cpp
+++ b/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;
--- a/uriloader/base/Makefile.in
+++ b/uriloader/base/Makefile.in
@ -79,6 +79,7 @@ SDK_XPIDLSRCS = 						\
 JAVA_XPIDLSRCS = \
 				nsIDownload.idl \
 				nsITransfer.idl \
+				nsIWebProgressListener2.idl \
 				$(NULL)

 XPIDLSRCS = 							\