[vlc-commits] commit: Mozilla: fixes for Win32 using the new np headers ( Jean-Baptiste Kempf )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Apr 24 00:37:04 2010 +0200| [5be2a8007b4a259b9373d8aa930ab449158536c8] | committer: Jean-Baptiste Kempf 

Mozilla: fixes for Win32 using the new np headers
(cherry picked from commit 0402d57ec6b55d5f0739dd4f997d57a73958a74e)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 projects/mozilla/support/npwin.cpp |    2 ++
 projects/mozilla/vlcplugin.h       |   13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/projects/mozilla/support/npwin.cpp b/projects/mozilla/support/npwin.cpp
index 13a5396..e384b3e 100644
--- a/projects/mozilla/support/npwin.cpp
+++ b/projects/mozilla/support/npwin.cpp
@@ -30,6 +30,8 @@
 
 //#define OJI 1
 
+#include "../vlcplugin.h"
+
 #ifndef _NPAPI_H_
 #   include "npapi.h"
 #endif
diff --git a/projects/mozilla/vlcplugin.h b/projects/mozilla/vlcplugin.h
index 4ec3814..ff2e4cf 100644
--- a/projects/mozilla/vlcplugin.h
+++ b/projects/mozilla/vlcplugin.h
@@ -41,11 +41,6 @@
 #define MOZ_X11 1
 #endif
 
-#include <npapi.h>
-#include <vector>
-
-#include "control/nporuntime.h"
-
 #if !defined(XP_MACOSX) && !defined(XP_UNIX) && !defined(XP_WIN)
 #define XP_UNIX 1
 #elif defined(XP_MACOSX)
@@ -54,8 +49,8 @@
 
 #ifdef XP_WIN
     /* Windows stuff */
-#   include <winbase.h>
 #   include <windows.h>
+#   include <winbase.h>
 #endif
 
 #ifdef XP_MACOSX
@@ -83,6 +78,12 @@
 #   define __MIN(a, b)   ( ((a) < (b)) ? (a) : (b) )
 #endif
 
+#include <npapi.h>
+#include <vector>
+
+#include "control/nporuntime.h"
+
+
 typedef struct {
 #if defined(XP_UNIX)
     pthread_mutex_t mutex;