Commit 6d106e46 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf Committed by Rémi Denis-Courmont

Mozilla: More fixes for XulRunner 1.9.2

parent 9e704a92
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <assert.h>
/***************************************************************************** /*****************************************************************************
* utilitiy functions * utilitiy functions
...@@ -105,7 +106,11 @@ static void plugin_unlock(plugin_lock_t *lock) ...@@ -105,7 +106,11 @@ static void plugin_unlock(plugin_lock_t *lock)
/***************************************************************************** /*****************************************************************************
* VlcPlugin constructor and destructor * VlcPlugin constructor and destructor
*****************************************************************************/ *****************************************************************************/
#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
VlcPlugin::VlcPlugin( NPP instance, uint16 mode ) : VlcPlugin::VlcPlugin( NPP instance, uint16 mode ) :
#else
VlcPlugin::VlcPlugin( NPP instance, uint16_t mode ) :
#endif
i_npmode(mode), i_npmode(mode),
b_stream(0), b_stream(0),
b_autoplay(1), b_autoplay(1),
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
# include <mozilla-config.h> # include <mozilla-config.h>
#endif #endif
char * NPP_GetMIMEDescription( void ); char * NPP_GetMIMEDescription( void );
NPError NPP_Initialize( void ); NPError NPP_Initialize( void );
...@@ -38,8 +39,14 @@ jref NPP_GetJavaClass( void ); ...@@ -38,8 +39,14 @@ jref NPP_GetJavaClass( void );
#endif #endif
void NPP_Shutdown( void ); void NPP_Shutdown( void );
#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
char* argn[], char* argv[], NPSavedData* saved ); char* argn[], char* argv[], NPSavedData* saved );
#else
NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc,
char* argn[], char* argv[], NPSavedData* saved );
#endif
NPError NPP_Destroy( NPP instance, NPSavedData** save ); NPError NPP_Destroy( NPP instance, NPSavedData** save );
NPError NPP_GetValue( NPP instance, NPPVariable variable, void *value ); NPError NPP_GetValue( NPP instance, NPPVariable variable, void *value );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment