https://bugzilla.mozilla.org/show_bug.cgi?id=455458
xulrunner helpfully renamed npupp.h that gcjwebplugin.cc uses to npfunctions.h
and removed all the NewNPP_* macros (and jref is gone as well).
I'm trying now:
--- libjava/classpath/native/plugin/gcjwebplugin.cc.jj 2009-01-14
12:08:34.000000000 +0100
+++ libjava/classpath/native/plugin/gcjwebplugin.cc 2009-01-15
21:20:17.000000000 +0100
@@ -45,7 +45,7 @@ exception statement from your version. *
// Netscape plugin API includes.
#include <npapi.h>
-#include <npupp.h>
+#include <npfunctions.h>
// GLib includes.
#include <glib.h>
@@ -827,7 +827,7 @@ GCJ_URLNotify (NPP instance, const char*
PLUGIN_DEBUG ("GCJ_URLNotify return");
}
-jref
+void *
GCJ_GetJavaClass (void)
{
PLUGIN_DEBUG ("GCJ_GetJavaClass");
@@ -1669,17 +1669,17 @@ NP_Initialize (NPNetscapeFuncs* browserT
// Return to the browser the plugin functions that we implement.
pluginTable->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
pluginTable->size = sizeof (NPPluginFuncs);
- pluginTable->newp = NewNPP_NewProc (GCJ_New);
- pluginTable->destroy = NewNPP_DestroyProc (GCJ_Destroy);
- pluginTable->setwindow = NewNPP_SetWindowProc (GCJ_SetWindow);
- pluginTable->newstream = NewNPP_NewStreamProc (GCJ_NewStream);
- pluginTable->destroystream = NewNPP_DestroyStreamProc (GCJ_DestroyStream);
- pluginTable->asfile = NewNPP_StreamAsFileProc (GCJ_StreamAsFile);
- pluginTable->writeready = NewNPP_WriteReadyProc (GCJ_WriteReady);
- pluginTable->write = NewNPP_WriteProc (GCJ_Write);
- pluginTable->print = NewNPP_PrintProc (GCJ_Print);
- pluginTable->urlnotify = NewNPP_URLNotifyProc (GCJ_URLNotify);
- pluginTable->getvalue = NewNPP_GetValueProc (GCJ_GetValue);
+ pluginTable->newp = (NPP_NewProc) (GCJ_New);
+ pluginTable->destroy = (NPP_DestroyProc) (GCJ_Destroy);
+ pluginTable->setwindow = (NPP_SetWindowProc) (GCJ_SetWindow);
+ pluginTable->newstream = (NPP_NewStreamProc) (GCJ_NewStream);
+ pluginTable->destroystream = (NPP_DestroyStreamProc) (GCJ_DestroyStream);
+ pluginTable->asfile = (NPP_StreamAsFileProc) (GCJ_StreamAsFile);
+ pluginTable->writeready = (NPP_WriteReadyProc) (GCJ_WriteReady);
+ pluginTable->write = (NPP_WriteProc) (GCJ_Write);
+ pluginTable->print = (NPP_PrintProc) (GCJ_Print);
+ pluginTable->urlnotify = (NPP_URLNotifyProc) (GCJ_URLNotify);
+ pluginTable->getvalue = (NPP_GetValueProc) (GCJ_GetValue);
initialized = true;
just to see if it compiles. I guess the removal of NewNPP_* macros shouldn't
hurt even with npupp.h and older xulrunner/firefox/mozilla etc., npupp.h vs
npfunctions.h probably needs configure to determine it and jref I have no idea
about why that function is defined at all, when it isn't referenced anywhere.
OT, the libjava/testsuite/libjava.lang/PR35020.java testcase doesn't compile
with ecj (tried eclipse-ecj 3.3.2 and 3.4.1):
gcj -C PR35020.java
PR35020.java:20: warning: PrivilegedAction is a raw type. References to generic
type PrivilegedAction<T> should be parameterized
System.out.println((new java.security.PrivilegedAction()
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
PR35020.java:28: error: outer$inner.inner cannot be resolved to a type
System.out.println(outer$inner.inner.class.getSimpleName());
^^^^^^^^^^^^^^^^^
2 problems (1 error, 1 warning)
--
Summary: gcjwebplugin.cc doesn't compile against latest xulrunner
1.9.1 sdk
Product: gcc
Version: 4.4.0
Status: UNCONFIRMED
Severity: normal
Priority: P3
Component: libgcj
AssignedTo: unassigned at gcc dot gnu dot org
ReportedBy: jakub at gcc dot gnu dot org
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38861
