linux: Fix compilation error caused by X header.

2014-07-21 13:48:23 +00:00 · 2014-07-21 13:48:23 +00:00 · e6998dfd4b
commit e6998dfd4b
parent 21949e2f0c
2 changed files with 12 additions and 0 deletions
--- a/atom/browser/ui/file_dialog_gtk.cc
+++ b/atom/browser/ui/file_dialog_gtk.cc
@ -8,6 +8,12 @@
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>

+// This conflicts with mate::Converter,
+#undef True
+#undef False
+// and V8.
+#undef None
+
 #include "atom/browser/native_window.h"
 #include "base/callback.h"
 #include "base/file_util.h"
--- a/atom/browser/ui/views/global_menu_bar_x11.cc
+++ b/atom/browser/ui/views/global_menu_bar_x11.cc
@ -6,6 +6,12 @@

 #include <X11/Xlib.h>

+// This conflicts with mate::Converter,
+#undef True
+#undef False
+// and V8.
+#undef None
+
 #include <dlfcn.h>
 #include <glib-object.h>