- Don't hardcode OJI define - deprecated xith libxul 1.9.2

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

diff --git a/projects/mozilla/support/npunix.c b/projects/mozilla/support/npunix.c
index 9596c27c17b251a3be0f41f2490eff0d8fd2c96e..9eb851cf905fef64e91e3910676d48e6c0185a97 100644 (file)
--- a/projects/mozilla/support/npunix.c
+++ b/projects/mozilla/support/npunix.c
@@ -46,7 +46,6 @@
 #include "config.h"
 
 #define XP_UNIX 1
-#define OJI 1
 
 #include <npapi.h>
 #if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)

diff --git a/projects/mozilla/vlcshell.cpp b/projects/mozilla/vlcshell.cpp
index bff669d6edec1e6c44894e6d621a9c77a15ffacd..5de1ed03813603030b0be47a8ecb130f2daf30f1 100644 (file)
--- a/projects/mozilla/vlcshell.cpp
+++ b/projects/mozilla/vlcshell.cpp
@@ -272,10 +272,12 @@ NPError NPP_Initialize( void )
     return NPERR_NO_ERROR;
 }
 
+#ifdef OJI
 jref NPP_GetJavaClass( void )
 {
     return NULL;
 }
+#endif
 
 void NPP_Shutdown( void )
 {

diff --git a/projects/mozilla/vlcshell.h b/projects/mozilla/vlcshell.h
index 6dd156158f4cc21c7e4305f00c4d058ec3b38d93..114865ae966fbcfb7ff4fbf374b8f8db2e39a7ff 100644 (file)
--- a/projects/mozilla/vlcshell.h
+++ b/projects/mozilla/vlcshell.h
@@ -27,7 +27,10 @@
 char * NPP_GetMIMEDescription( void );
 
 NPError NPP_Initialize( void );
+
+#ifdef OJI 
 jref NPP_GetJavaClass( void );
+#endif
 void NPP_Shutdown( void );
 
 NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,