Commit aa1f844e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Firefox 4 compatibility

Close #4802
Ref gentoo bug #361263
parent b98f8122
......@@ -22,7 +22,7 @@ libvlcplugin_la_SOURCES = \
support/classinfo.h \
$(SOURCES_support)
EXTRA_libvlcplugin_la_SOURCES = \
support/npwin.cpp support/npmac.cpp support/npunix.c
support/npwin.cpp support/npmac.cpp support/npunix.cpp
libvlcplugin_la_DEPENDENCIES =
libvlcplugin_la_LIBADD = $(LIBVLC_LIBS)
libvlcplugin_la_LDFLAGS = \
......@@ -50,13 +50,13 @@ libvlcplugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) \
npvlc_LTLIBRARIES = libvlcplugin.la
SOURCES_support = support/npunix.c
SOURCES_support = support/npunix.cpp
else
# Under Win32, Mozilla plugins need to be named NP******.DLL, but under Unix
# the common naming scheme is lib******plugin.so. Also, we need npwin.cpp
# under Win32 and npunix.c under Unix.
# under Win32 and npunix.cpp under Unix.
#
lib_LTLIBRARIES = npvlc.la
......
......@@ -635,7 +635,7 @@ void Private_URLNotify(NPP instance, const char* url,
NPReason reason, void* notifyData);
void Private_Print(NPP instance, NPPrint* platformPrint);
NPError Private_GetValue(NPP instance, NPPVariable variable, void *r_value);
NPError Private_SetValue(NPP instance, NPPVariable variable, void *r_value);
NPError Private_SetValue(NPP instance, NPNVariable variable, void *r_value);
#ifdef OJI
JRIGlobalRef Private_GetJavaClass(void);
#endif
......@@ -736,7 +736,7 @@ Private_GetValue(NPP instance, NPPVariable variable, void *r_value)
}
NPError
Private_SetValue(NPP instance, NPPVariable variable, void *r_value)
Private_SetValue(NPP instance, NPNVariable variable, void *r_value)
{
PLUGINDEBUGSTR("SetValue");
return NPP_SetValue(instance, variable, r_value);
......@@ -782,7 +782,7 @@ NP_GetMIMEDescription(void)
NPError
NP_GetValue(void* future, NPPVariable variable, void *value)
{
return NPP_GetValue(future, variable, value);
return NPP_GetValue((NPP)future, variable, value);
}
/*
......
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