Mozilla SDK libxul 1.9.1 - preliminary support

According to https://bugzilla.mozilla.org/show_bug.cgi?id=455458
npupp.h has been renamed to npfunctions.h with libxul 1.9.1

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

diff --git a/configure.ac b/configure.ac
index 319677fa4cb035492c44a2d96ccce484ef50e4ae..e70c83eff151fecc63c98bfc3e4a2219b192af88 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5563,6 +5563,7 @@ then
     AS_IF( [test $found = 1],[
         CPPFLAGS="${CPPFLAGS_save} ${MOZILLA_CFLAGS}"
         MOZILLA_REQUIRED_HEADERS=1
+        AC_CHECK_HEADERS([npfunctions.h])
         AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
         AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0,
           [#if HAVE_NPAPI_H

diff --git a/projects/mozilla/support/npmac.cpp b/projects/mozilla/support/npmac.cpp
index ccc3945058717b13d07546161a787876ba75c8ed..d5901bfc7bd6a5ce2a86572372eff44239583d5d 100644 (file)
--- a/projects/mozilla/support/npmac.cpp
+++ b/projects/mozilla/support/npmac.cpp
@@ -4,6 +4,8 @@
 //
 //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
+#include "config.h"
+
 #include <string.h>
 
 #include <Processes.h>
@@ -54,7 +56,11 @@
 #undef XP_UNIX
 #endif
 
+#ifdef HAVE_NPFUNCTIONS_H
+#include "npfunctions.h"
+#else
 #include "npupp.h"
+#endif
 
 #ifdef __MWERKS__
 #ifndef powerc

diff --git a/projects/mozilla/support/npunix.c b/projects/mozilla/support/npunix.c
index afeed1a48ca9c0f5ee28acb7ef12ea6bd35607cd..319c0e1574c2364e3b01dbd78c554d20afb247f4 100644 (file)
--- a/projects/mozilla/support/npunix.c
+++ b/projects/mozilla/support/npunix.c
@@ -38,12 +38,18 @@
  *----------------------------------------------------------------------
  */
 
+#include "config.h"
+
 #define XP_UNIX 1
 #define OJI 1
 
 #include <stdio.h>
 #include <npapi.h>
+#ifdef HAVE_NPFUNCTIONS_H
+#include <npfunctions.h>
+#else
 #include <npupp.h>
+#endif
 
 /*
  * Define PLUGIN_TRACE to have the wrapper functions print

diff --git a/projects/mozilla/support/npwin.cpp b/projects/mozilla/support/npwin.cpp
index c277f846e338b5ff5771878df2fb92ea21d467e9..d9a0a9cef27f69a1ea24596a569291e503f5237e 100644 (file)
--- a/projects/mozilla/support/npwin.cpp
+++ b/projects/mozilla/support/npwin.cpp
@@ -42,7 +42,11 @@
 #endif
 
 #include "npapi.h"
+#ifdef HAVE_NPFUNCTIONS_H
+#include "npfunctions.h"
+#else
 #include "npupp.h"
+#endif
 
 //\\// DEFINE
 #define NP_EXPORT