Bug 1430725 - Undefine X11 None at ScreenHelperGTK.h as it conflicts our JS code, r?jhorak draft
authorMartin Stransky <stransky@redhat.com>
Tue, 16 Jan 2018 10:09:36 +0100
changeset 720825 e8084b9947371617eaa5ca3d4affb15e63673d8f
parent 720793 ec60ecf17b721a61220d4e89113c96b456d7fd14
child 746163 5aca7602a7377569a1e23f18f4e9dfcb0722fdc9
push id95656
push userstransky@redhat.com
push dateTue, 16 Jan 2018 10:12:37 +0000
reviewersjhorak
bugs1430725
milestone59.0a1
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: