Skip to content

V
vlc-2-2
Commit 6dbe4986 authored by Nicolas Chauvet's avatar Nicolas Chauvet Committed by Rémi Denis-Courmont
Browse files
Options

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

Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent 889aebe3
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
projects/mozilla/support/npunix.c
View file @ 6dbe4986
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include "config.h" #include "config.h"
#define XP_UNIX 1 #define XP_UNIX 1
#define OJI 1
#include <npapi.h> #include <npapi.h>
#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) #if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
......
projects/mozilla/vlcshell.cpp
View file @ 6dbe4986
...@@ -272,10 +272,12 @@ NPError NPP_Initialize( void ) ...@@ -272,10 +272,12 @@ NPError NPP_Initialize( void )
return NPERR_NO_ERROR; return NPERR_NO_ERROR;
} }
#ifdef OJI
jref NPP_GetJavaClass( void ) jref NPP_GetJavaClass( void )
{ {
return NULL; return NULL;
} }
#endif
void NPP_Shutdown( void ) void NPP_Shutdown( void )
{ {
......
projects/mozilla/vlcshell.h
View file @ 6dbe4986
...@@ -27,7 +27,10 @@ ...@@ -27,7 +27,10 @@
char * NPP_GetMIMEDescription( void ); char * NPP_GetMIMEDescription( void );
NPError NPP_Initialize( void ); NPError NPP_Initialize( void );
#ifdef OJI
jref NPP_GetJavaClass( void ); jref NPP_GetJavaClass( void );
#endif
void NPP_Shutdown( void ); void NPP_Shutdown( void );
NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment