From e6998dfd4b747adfbf1e18ba24f49a3d9b92f0be Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 21 Jul 2014 13:48:23 +0000
Subject: [PATCH] linux: Fix compilation error caused by X header.

---
 atom/browser/ui/file_dialog_gtk.cc           | 6 ++++++
 atom/browser/ui/views/global_menu_bar_x11.cc | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/atom/browser/ui/file_dialog_gtk.cc b/atom/browser/ui/file_dialog_gtk.cc
index af08f8247f..21cd141665 100644
--- 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"
diff --git a/atom/browser/ui/views/global_menu_bar_x11.cc b/atom/browser/ui/views/global_menu_bar_x11.cc
index 4b7338eab1..fd6f80cdec 100644
--- 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>