[vlc-commits] commit: mozilla - Avoid usage of HAVE_NPFUNCTIONS_H (Nicolas Chauvet )

[git at videolan.org]

vlc | branch: master | Nicolas Chauvet <kwizart at gmail.com> | Mon Mar 29 23:45:45 2010 +0200| [889aebe3522227c9a9b28bf7c1b114adece66bf0] | committer: Rémi Denis-Courmont 

mozilla - Avoid usage of HAVE_NPFUNCTIONS_H

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=889aebe3522227c9a9b28bf7c1b114adece66bf0
---

 configure.ac                       |    1 -
 projects/mozilla/support/npmac.cpp |    6 +++---
 projects/mozilla/support/npunix.c  |    6 +++---
 projects/mozilla/support/npwin.cpp |    8 +++-----
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7021c5d..486a55d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4574,7 +4574,6 @@ 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 fc5b4be..72747b6 100644
--- a/projects/mozilla/support/npmac.cpp
+++ b/projects/mozilla/support/npmac.cpp
@@ -76,10 +76,10 @@
 #undef XP_UNIX
 #endif
 
-#ifdef HAVE_NPFUNCTIONS_H
-#include "npfunctions.h"
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+#include "npupp.h" 
 #else
-#include "npupp.h"
+#include "npfunctions.h"
 #endif
 
 #include "../vlcshell.h"
diff --git a/projects/mozilla/support/npunix.c b/projects/mozilla/support/npunix.c
index 52096bc..9596c27 100644
--- a/projects/mozilla/support/npunix.c
+++ b/projects/mozilla/support/npunix.c
@@ -49,10 +49,10 @@
 #define OJI 1
 
 #include <npapi.h>
-#ifdef HAVE_NPFUNCTIONS_H
-#include <npfunctions.h>
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+#include "npupp.h" 
 #else
-#include <npupp.h>
+#include "npfunctions.h"
 #endif
 
 #include "../vlcshell.h"
diff --git a/projects/mozilla/support/npwin.cpp b/projects/mozilla/support/npwin.cpp
index 463c760..4674194 100644
--- a/projects/mozilla/support/npwin.cpp
+++ b/projects/mozilla/support/npwin.cpp
@@ -37,12 +37,10 @@
 #ifndef _NPAPI_H_
 #   include "npapi.h"
 #endif
-#ifdef HAVE_NPFUNCTIONS_H
-#   include "npfunctions.h"
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+#include "npupp.h" 
 #else
-#   ifndef _NPUPP_H_
-#      include "npupp.h"
-#   endif
+#include "npfunctions.h"
 #endif
 
 #include "../vlcshell.h"