Bug 1430725 - Undefine X11 None at ScreenHelperGTK.h as it conflicts our JS code, r=jhorak
authorMartin Stransky <stransky@redhat.com>
Tue, 16 Jan 2018 10:09:36 +0100
changeset 399417 3fa7cfb635b74eec51e67549b2b06214f6fba749
parent 399416 44830cef5749f0f91e2389682002805e4ae1c5c6
child 399418 dbfd798e491b86e55ec11b8d5cccc260e885f619
push id33263
push userapavel@mozilla.com
push dateTue, 16 Jan 2018 15:58:11 +0000
treeherdermozilla-central@9be7249e74fd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjhorak
bugs1430725
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1430725 - Undefine X11 None at ScreenHelperGTK.h as it conflicts our JS code, r=jhorak MozReview-Commit-ID: AZr8GuPb8wx
widget/gtk/ScreenHelperGTK.h
--- a/widget/gtk/ScreenHelperGTK.h
+++ b/widget/gtk/ScreenHelperGTK.h
@@ -7,16 +7,17 @@
 #ifndef mozilla_widget_gtk_ScreenHelperGTK_h
 #define mozilla_widget_gtk_ScreenHelperGTK_h
 
 #include "mozilla/widget/ScreenManager.h"
 
 #include "gdk/gdk.h"
 #ifdef MOZ_X11
 #include <X11/Xlib.h>
+#include "X11UndefineNone.h"
 #endif
 
 namespace mozilla {
 namespace widget {
 
 class ScreenHelperGTK final : public ScreenManager::Helper
 {
 public: