github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-25 07:18:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix symbol conflicts in Xlib.h

Browse Source
This commit is contained in:
Cheng Zhao
2017-04-17 17:21:13 +09:00
parent b3d60bfb3a
commit 8c5fd76286
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
atom/browser/ui/views/global_menu_bar_x11.cc
View File

@@ -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"