Commit ba41cc1a authored by Nicolas Chauvet (kwizart's avatar Nicolas Chauvet (kwizart Committed by Christophe Mutricy

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: default avatarChristophe Mutricy <xtophe@videolan.org>
parent e4a5bfc0
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -42,7 +42,11 @@
#endif
#include "npapi.h"
#ifdef HAVE_NPFUNCTIONS_H
#include "npfunctions.h"
#else
#include "npupp.h"
#endif
//\\// DEFINE
#define NP_EXPORT
......
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