[vlc-commits] Make vlc compatible with xulrunner 1.9.1

[Benjamin Drung]

vlc/vlc-1.1 | branch: master | Benjamin Drung <bdrung at debian.org> | Thu Jul 21 23:24:29 2011 +0300| [e4eae3142ecce987ec248b29d23d8e26470318b8] | committer: Rémi Denis-Courmont

Make vlc compatible with xulrunner 1.9.1

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

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

 configure.ac                            |    4 ++--
 projects/mozilla/control/nporuntime.cpp |    2 +-
 projects/mozilla/vlcplugin.h            |    4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 86a7eac..2fb2604 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4559,8 +4559,8 @@ then
           if test -n "$i"
           then
             echo "Trying to find $i package" >&AS_MESSAGE_LOG_FD
-            AC_MSG_CHECKING([for $i >= 1.9.2])
-            if $PKG_CONFIG --exists --print-errors "$i >= 1.9.2" 2>&AS_MESSAGE_LOG_FD
+            AC_MSG_CHECKING([for $i >= 1.9.1])
+            if $PKG_CONFIG --exists --print-errors "$i >= 1.9.1" 2>&AS_MESSAGE_LOG_FD
             then
               echo "Using $i pkg-config package." >&AS_MESSAGE_LOG_FD
               echo "Using $i package." >&AS_MESSAGE_FD
diff --git a/projects/mozilla/control/nporuntime.cpp b/projects/mozilla/control/nporuntime.cpp
index 396bbb9..b240ef9 100644
--- a/projects/mozilla/control/nporuntime.cpp
+++ b/projects/mozilla/control/nporuntime.cpp
@@ -27,8 +27,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "nporuntime.h"
 #include "vlcplugin.h"
+#include "nporuntime.h"
 
 char* RuntimeNPObject::stringValue(const NPString &s)
 {
diff --git a/projects/mozilla/vlcplugin.h b/projects/mozilla/vlcplugin.h
index 0a40670..e81fb7d 100644
--- a/projects/mozilla/vlcplugin.h
+++ b/projects/mozilla/vlcplugin.h
@@ -29,6 +29,10 @@
 #ifndef __VLCPLUGIN_H__
 #define __VLCPLUGIN_H__
 
+// Changes for compatibility to xulrunner 1.9.1
+#define UTF8Characters utf8characters
+#define UTF8Length utf8length
+
 #include <vlc/vlc.h>
 
 // Setup XP_MACOSX, XP_UNIX, XP_WIN