[vlc-commits] commit: Mozilla: More fixes for XulRunner 1.9.2 (Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Apr 10 16:17:09 2010 +0200| [4eea1289d83879fcafed7bb0e1f37966961f43e3] | committer: Jean-Baptiste Kempf 

Mozilla: More fixes for XulRunner 1.9.2

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4eea1289d83879fcafed7bb0e1f37966961f43e3
---

 projects/mozilla/vlcplugin.cpp |    5 +++++
 projects/mozilla/vlcshell.h    |    7 +++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/projects/mozilla/vlcplugin.cpp b/projects/mozilla/vlcplugin.cpp
index caeabda..48a287b 100644
--- 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 ecd868d..fca6afa 100644
--- 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 );