]> git.sesse.net Git - vlc/commitdiff
Setup XP_WIN, XP_UNIX, XP_MACOSX macros.
authorDavid Menestrina <dmenest-vlc at ofb dot net>
Mon, 19 Apr 2010 18:33:36 +0000 (11:33 -0700)
committerJean-Baptiste Kempf <jb@videolan.org>
Fri, 23 Apr 2010 22:47:12 +0000 (00:47 +0200)
These macros were previously defined in mozilla-config.h, but we're
not supposed to include those files according to the mozilla devs.
However, the macros must be defined for npapi.h to define the
necessary platform-specific structures.  This patch sets up the
macros before including npapi.h.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
projects/mozilla/vlcplugin.h

index c13b5e721fb34ac7e35d6bf0d063c97480e2d64c..4ec38149b687829c0fd363845bfb8a0c21e71b9f 100644 (file)
 #define __VLCPLUGIN_H__
 
 #include <vlc/vlc.h>
+
+// Setup XP_MACOSX, XP_UNIX, XP_WIN
+#if defined(_WIN32)
+#define XP_WIN 1
+#elif defined(__APPLE__)
+#define XP_MACOSX 1
+#else
+#define XP_UNIX 1
+#define MOZ_X11 1
+#endif
+
 #include <npapi.h>
 #include <vector>