Mozilla: More fixes for XulRunner 1.9.2

diff --git a/projects/mozilla/vlcplugin.cpp b/projects/mozilla/vlcplugin.cpp
index caeabdacccb76a9f5650e76c2beebc7719a3d1ad..48a287be11afde9ba73fc3f6db14b05933a1a3d9 100644 (file)
--- a/projects/mozilla/vlcplugin.cpp
+++ b/projects/mozilla/vlcplugin.cpp
@@ -46,6 +46,7 @@
 #endif
 
 #include <stdio.h>
+#include <assert.h>
 
 /*****************************************************************************
  * utilitiy functions
@@ -105,7 +106,11 @@ static void plugin_unlock(plugin_lock_t *lock)
 /*****************************************************************************
  * VlcPlugin constructor and destructor
  *****************************************************************************/
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
 VlcPlugin::VlcPlugin( NPP instance, uint16 mode ) :
+#else
+VlcPlugin::VlcPlugin( NPP instance, uint16_t mode ) :
+#endif
     i_npmode(mode),
     b_stream(0),
     b_autoplay(1),

diff --git a/projects/mozilla/vlcshell.h b/projects/mozilla/vlcshell.h
index ecd868d9ff2c36b1c8db4eabcd52a2a84454ab6e..fca6afaa689e2947a918497bf25cace2d65abce9 100644 (file)
--- a/projects/mozilla/vlcshell.h
+++ b/projects/mozilla/vlcshell.h
@@ -29,6 +29,7 @@
 #   include <mozilla-config.h>
 #endif
 
+
 char * NPP_GetMIMEDescription( void );
 
 NPError NPP_Initialize( void );
@@ -38,8 +39,14 @@ jref NPP_GetJavaClass( void );
 #endif
 void NPP_Shutdown( void );
 
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
 NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
                  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_GetValue( NPP instance, NPPVariable variable, void *value );