[vlc-commits] Avoid defines redefinitions

Jean-Baptiste Kempf git at videolan.org
Wed Apr 23 20:06:30 CEST 2014


npapi-vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Apr 23 20:06:08 2014 +0200| [d0137d72c75e45c51540544eef457640e005c110] | committer: Jean-Baptiste Kempf

Avoid defines redefinitions

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

 npapi/support/npunix.cpp |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/npapi/support/npunix.cpp b/npapi/support/npunix.cpp
index f1edeb0..8a127b7 100644
--- a/npapi/support/npunix.cpp
+++ b/npapi/support/npunix.cpp
@@ -47,7 +47,8 @@
 # include "config.h"
 #endif
 
-#define XP_UNIX 1
+#include "../common.h"
+#include "../vlcshell.h"
 
 #include <npapi.h>
 #if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
@@ -59,8 +60,6 @@
 #endif
 
 #include <cstring>
-#include "../common.h"
-#include "../vlcshell.h"
 
 #ifdef USE_GTK
 # include <gtk/gtk.h>



More information about the vlc-commits mailing list