Bug 1444432 - Add an #include "X11UndefineNone.h" to GLXLibrary.h after the X11 header include, so that TiledContentClient.h doesn't suffer from a redefined None. r?jrmuizel draft
authorMarkus Stange <mstange@themasta.com>
Thu, 12 Apr 2018 23:37:29 -0400
changeset 781546 1f2ae4e8b9f4c49eda26973c03a4dcb8bde93e09
parent 781545 1a82f74ff068a061ae8dc7c948e949afcab492fb
child 781547 fb0181e1cdb254b78b4c1041601ec95f01b1624b
push id106334
push userbmo:mstange@themasta.com
push dateFri, 13 Apr 2018 04:36:02 +0000
reviewersjrmuizel
bugs1444432
milestone61.0a1
Bug 1444432 - Add an #include "X11UndefineNone.h" to GLXLibrary.h after the X11 header include, so that TiledContentClient.h doesn't suffer from a redefined None. r?jrmuizel MozReview-Commit-ID: 8PpFuax0XHb
gfx/gl/GLXLibrary.h
--- a/gfx/gl/GLXLibrary.h
+++ b/gfx/gl/GLXLibrary.h
@@ -8,16 +8,17 @@
 
 #include "GLContextTypes.h"
 #include "prlink.h"
 typedef realGLboolean GLboolean;
 
 // stuff from glx.h
 #include "X11/Xlib.h"
 #include "X11/Xutil.h" // for XVisualInfo
+#include "X11UndefineNone.h"
 typedef struct __GLXcontextRec* GLXContext;
 typedef XID GLXPixmap;
 typedef XID GLXDrawable;
 /* GLX 1.3 and later */
 typedef struct __GLXFBConfigRec* GLXFBConfig;
 // end of stuff from glx.h
 #include "prenv.h"