vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <[email protected]> | Mon May 30 17:02:41 2011 +0200| [cca505bdc653b16d953f12626a3f0c9689ceb56e] | committer: Jean-Baptiste Kempf
Firefox 4 compatibility Close #4802 Ref gentoo bug #361263 > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=cca505bdc653b16d953f12626a3f0c9689ceb56e --- projects/mozilla/Makefile.am | 6 +++--- projects/mozilla/support/{npunix.c => npunix.cpp} | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/mozilla/Makefile.am b/projects/mozilla/Makefile.am index 230b720..59be6a7 100644 --- a/projects/mozilla/Makefile.am +++ b/projects/mozilla/Makefile.am @@ -19,7 +19,7 @@ SOURCES_mozilla_common = \ support/classinfo.h DIST_sources = $(SOURCES_mozilla_common) \ - support/npwin.cpp support/npmac.cpp support/npunix.c + support/npwin.cpp support/npmac.cpp support/npunix.cpp if BUILD_MOZILLA @@ -30,7 +30,7 @@ if HAVE_WIN32 # 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 @@ -135,7 +135,7 @@ npvlc_LTLIBRARIES = libvlcplugin.la npvlc = libvlcplugin$(LIBEXT) npvlcdir = $(libdir)/mozilla/plugins -SOURCES_support = support/npunix.c +SOURCES_support = support/npunix.cpp libvlcplugin_la_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support) libvlcplugin_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla` $(CPPFLAGS_mozilla_EXTRA) diff --git a/projects/mozilla/support/npunix.c b/projects/mozilla/support/npunix.cpp similarity index 99% rename from projects/mozilla/support/npunix.c rename to projects/mozilla/support/npunix.cpp index 9eb851c..31515f9 100644 --- a/projects/mozilla/support/npunix.c +++ b/projects/mozilla/support/npunix.cpp @@ -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); } /* _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
