From 8c5fd76286bd62c452170cda062eff3decd59ec5 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 17 Apr 2017 17:21:13 +0900
Subject: [PATCH] Fix symbol conflicts in Xlib.h

---
 atom/browser/ui/views/global_menu_bar_x11.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/atom/browser/ui/views/global_menu_bar_x11.cc b/atom/browser/ui/views/global_menu_bar_x11.cc
index eb5a8d81d23..d48d86961ba 100644
--- a/atom/browser/ui/views/global_menu_bar_x11.cc
+++ b/atom/browser/ui/views/global_menu_bar_x11.cc
@@ -4,20 +4,20 @@
 
 #include "atom/browser/ui/views/global_menu_bar_x11.h"
 
-// There are conflicts between Xlib.h and this header.
-#include "atom/browser/native_window_views.h"  // NOLINT
-
 #include <X11/Xlib.h>
 
 // This conflicts with mate::Converter,
 #undef True
 #undef False
-// and V8.
+// and V8,
 #undef None
+// and url_request_status.h,
+#undef Status
 
 #include <dlfcn.h>
 #include <glib-object.h>
 
+#include "atom/browser/native_window_views.h"
 #include "atom/browser/ui/atom_menu_model.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"