Commit 889aebe3 authored by Nicolas Chauvet's avatar Nicolas Chauvet Committed by Rémi Denis-Courmont
Browse files

mozilla - Avoid usage of HAVE_NPFUNCTIONS_H


Signed-off-by: Rémi Denis-Courmont's avatarRémi Denis-Courmont <remi@remlab.net>
parent 22d2ded4
...@@ -4574,7 +4574,6 @@ then ...@@ -4574,7 +4574,6 @@ then
AS_IF( [test $found = 1],[ AS_IF( [test $found = 1],[
CPPFLAGS="${CPPFLAGS_save} ${MOZILLA_CFLAGS}" CPPFLAGS="${CPPFLAGS_save} ${MOZILLA_CFLAGS}"
MOZILLA_REQUIRED_HEADERS=1 MOZILLA_REQUIRED_HEADERS=1
AC_CHECK_HEADERS([npfunctions.h])
AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0) AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0, AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0,
[#if HAVE_NPAPI_H [#if HAVE_NPAPI_H
......
...@@ -76,10 +76,10 @@ ...@@ -76,10 +76,10 @@
#undef XP_UNIX #undef XP_UNIX
#endif #endif
#ifdef HAVE_NPFUNCTIONS_H #if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
#include "npfunctions.h"
#else
#include "npupp.h" #include "npupp.h"
#else
#include "npfunctions.h"
#endif #endif
#include "../vlcshell.h" #include "../vlcshell.h"
......
...@@ -49,10 +49,10 @@ ...@@ -49,10 +49,10 @@
#define OJI 1 #define OJI 1
#include <npapi.h> #include <npapi.h>
#ifdef HAVE_NPFUNCTIONS_H #if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
#include <npfunctions.h> #include "npupp.h"
#else #else
#include <npupp.h> #include "npfunctions.h"
#endif #endif
#include "../vlcshell.h" #include "../vlcshell.h"
......
...@@ -37,12 +37,10 @@ ...@@ -37,12 +37,10 @@
#ifndef _NPAPI_H_ #ifndef _NPAPI_H_
# include "npapi.h" # include "npapi.h"
#endif #endif
#ifdef HAVE_NPFUNCTIONS_H #if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
# include "npfunctions.h" #include "npupp.h"
#else #else
# ifndef _NPUPP_H_ #include "npfunctions.h"
# include "npupp.h"
# endif
#endif #endif
#include "../vlcshell.h" #include "../vlcshell.h"
......
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