mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

linux: Fix compilation error caused by X header.

Browse source
This commit is contained in:
Cheng Zhao 2014-07-21 13:48:23 +00:00
parent 21949e2f0c
commit e6998dfd4b
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/ui/file_dialog_gtk.cc
View file

@ -8,6 +8,12 @@
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <gtk/gtk.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 "atom/browser/native_window.h"
#include "base/callback.h" #include "base/callback.h"
#include "base/file_util.h" #include "base/file_util.h"

6
atom/browser/ui/views/global_menu_bar_x11.cc
View file

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