From 7f720bdbd413a22e20c2f4616d364ae101c63463 Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Mon, 16 Feb 2009 15:33:46 +0000 Subject: gcjwebplugin.cc: Cope with the changed header file format. 2009-02-05 Andrew Haley * native/plugin/gcjwebplugin.cc: Cope with the changed header file format. https://bugzilla.mozilla.org/show_bug.cgi?id=455458 (GCJ_GetJavaClass): Likewise. (NP_Initialize): Likewise. From-SVN: r144203 --- libjava/classpath/native/plugin/gcjwebplugin.cc | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'libjava/classpath/native/plugin') diff --git a/libjava/classpath/native/plugin/gcjwebplugin.cc b/libjava/classpath/native/plugin/gcjwebplugin.cc index bb2bfa22343..71cffccb674 100644 --- a/libjava/classpath/native/plugin/gcjwebplugin.cc +++ b/libjava/classpath/native/plugin/gcjwebplugin.cc @@ -45,7 +45,11 @@ exception statement from your version. */ // Netscape plugin API includes. #include +#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) #include +#else +#include +#endif // GLib includes. #include @@ -827,7 +831,11 @@ GCJ_URLNotify (NPP instance, const char* url, NPReason reason, PLUGIN_DEBUG ("GCJ_URLNotify return"); } +#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) jref +#else +void* +#endif GCJ_GetJavaClass (void) { PLUGIN_DEBUG ("GCJ_GetJavaClass"); @@ -1669,6 +1677,7 @@ NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable) // Return to the browser the plugin functions that we implement. pluginTable->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR; pluginTable->size = sizeof (NPPluginFuncs); +#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) pluginTable->newp = NewNPP_NewProc (GCJ_New); pluginTable->destroy = NewNPP_DestroyProc (GCJ_Destroy); pluginTable->setwindow = NewNPP_SetWindowProc (GCJ_SetWindow); @@ -1680,6 +1689,19 @@ NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable) pluginTable->print = NewNPP_PrintProc (GCJ_Print); pluginTable->urlnotify = NewNPP_URLNotifyProc (GCJ_URLNotify); pluginTable->getvalue = NewNPP_GetValueProc (GCJ_GetValue); +#else + pluginTable->newp = (NPP_NewProcPtr) (GCJ_New); + pluginTable->destroy = (NPP_DestroyProcPtr) (GCJ_Destroy); + pluginTable->setwindow = (NPP_SetWindowProcPtr) (GCJ_SetWindow); + pluginTable->newstream = (NPP_NewStreamProcPtr) (GCJ_NewStream); + pluginTable->destroystream = (NPP_DestroyStreamProcPtr) (GCJ_DestroyStream); + pluginTable->asfile = (NPP_StreamAsFileProcPtr) (GCJ_StreamAsFile); + pluginTable->writeready = (NPP_WriteReadyProcPtr) (GCJ_WriteReady); + pluginTable->write = (NPP_WriteProcPtr) (GCJ_Write); + pluginTable->print = (NPP_PrintProcPtr) (GCJ_Print); + pluginTable->urlnotify = (NPP_URLNotifyProcPtr) (GCJ_URLNotify); + pluginTable->getvalue = (NPP_GetValueProcPtr) (GCJ_GetValue); +#endif initialized = true; -- cgit v1.2.1