Bug 1431295 - Include "X11UndefineNone.h" after including gdx.h in nsWindow.h. r=botond
authorHiroyuki Ikezoe <hikezoe@mozilla.com>
Thu, 18 Jan 2018 14:12:51 +0900
changeset 399914 8fecffa14e4d0c8a1c1e2716ff845d5305f85229
parent 399913 5c16f89d055116b8015e7780b9c711b01dcfd0e3
child 399915 e53c7df917c70e98fb2f31879a932c3833736a56
push id33281
push usernerli@mozilla.com
push dateFri, 19 Jan 2018 10:08:27 +0000
treeherdermozilla-central@3af31d84214f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbotond
bugs1431295
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 1431295 - Include "X11UndefineNone.h" after including gdx.h in nsWindow.h. r=botond MozReview-Commit-ID: 9SumgYc5pNE
widget/gtk/nsWindow.h
--- a/widget/gtk/nsWindow.h
+++ b/widget/gtk/nsWindow.h
@@ -18,16 +18,17 @@
 
 #include "nsBaseWidget.h"
 #include "CompositorWidget.h"
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #ifdef MOZ_X11
 #include <gdk/gdkx.h>
+#include "X11UndefineNone.h"
 #endif /* MOZ_X11 */
 #ifdef MOZ_WAYLAND
 #include <gdk/gdkwayland.h>
 #endif
 
 #include "mozilla/widget/WindowSurface.h"
 #include "mozilla/widget/WindowSurfaceProvider.h"