From: Nicolas Chauvet Date: Mon, 29 Mar 2010 21:45:46 +0000 (+0200) Subject: - Don't hardcode OJI define - deprecated xith libxul 1.9.2 X-Git-Tag: 1.1.0-pre1~235 X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=6dbe4986f7c11370c2bc275491d4502f5f4c3c60 - Don't hardcode OJI define - deprecated xith libxul 1.9.2 Signed-off-by: Rémi Denis-Courmont --- diff --git a/projects/mozilla/support/npunix.c b/projects/mozilla/support/npunix.c index 9596c27c17..9eb851cf90 100644 --- 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 #if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) diff --git a/projects/mozilla/vlcshell.cpp b/projects/mozilla/vlcshell.cpp index bff669d6ed..5de1ed0381 100644 --- 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 6dd156158f..114865ae96 100644 --- 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,