Mozilla SDK libxul 1.9.1 - preliminary support
authorNicolas Chauvet (kwizart <kwizart@gmail.com>
Tue, 13 Jan 2009 18:32:36 +0000 (19:32 +0100)
committerChristophe Mutricy <xtophe@videolan.org>
Tue, 10 Feb 2009 23:51:20 +0000 (23:51 +0000)
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>
configure.ac
projects/mozilla/support/npmac.cpp
projects/mozilla/support/npunix.c
projects/mozilla/support/npwin.cpp

index 319677f..e70c83e 100644 (file)
@@ -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
index ccc3945..d5901bf 100644 (file)
@@ -4,6 +4,8 @@
 //
 //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
+#include "config.h"
+
 #include <string.h>
 
 #include <Processes.h>
 #undef XP_UNIX
 #endif
 
+#ifdef HAVE_NPFUNCTIONS_H
+#include "npfunctions.h"
+#else
 #include "npupp.h"
+#endif
 
 #ifdef __MWERKS__
 #ifndef powerc
index afeed1a..319c0e1 100644 (file)
  *----------------------------------------------------------------------
  */
 
+#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
index c277f84..d9a0a9c 100644 (file)
 #endif
 
 #include "npapi.h"
+#ifdef HAVE_NPFUNCTIONS_H
+#include "npfunctions.h"
+#else
 #include "npupp.h"
+#endif
 
 //\\// DEFINE
 #define NP_EXPORT