Mozilla: More (final?) Win32 compile fixes for XulRunner 1.9.2

[vlc] / projects / mozilla / vlcplugin.cpp

diff --git a/projects/mozilla/vlcplugin.cpp b/projects/mozilla/vlcplugin.cpp
index caeabdacccb76a9f5650e76c2beebc7719a3d1ad..b7794a478f90290296ccfa21878195f800af6ec8 100644 (file)
--- a/projects/mozilla/vlcplugin.cpp
+++ b/projects/mozilla/vlcplugin.cpp
@@ -36,6 +36,7 @@
 #include "control/npolibvlc.h"
 
 #include <ctype.h>
+
 #if defined(XP_UNIX)
 #   include <pthread.h>
 #elif defined(XP_WIN)
@@ -46,6 +47,8 @@
 #endif
 
 #include <stdio.h>
+#include <assert.h>
+#include <stdlib.h>
 
 /*****************************************************************************
  * utilitiy functions
@@ -105,7 +108,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),
@@ -230,7 +237,7 @@ inline EventObj::event_t EventObj::find_event(const char *s) const
 
 bool EventObj::insert(const NPString &s, NPObject *l, bool b)
 {
-    event_t e = find_event(s.utf8characters);
+    event_t e = find_event(s.UTF8Characters);
     if( e>=maxbit() )
         return false;
 
@@ -255,7 +262,7 @@ bool EventObj::insert(const NPString &s, NPObject *l, bool b)
 
 bool EventObj::remove(const NPString &s, NPObject *l, bool b)
 {
-    event_t e = find_event(s.utf8characters);
+    event_t e = find_event(s.UTF8Characters);
     if( e>=maxbit() || !get(e) )
         return false;