Bug 1431295 - Drop 'undef None' macro in gfx. r=botond
authorHiroyuki Ikezoe <hikezoe@mozilla.com>
Thu, 18 Jan 2018 14:12:51 +0900
changeset 454242 e53c7df917c70e98fb2f31879a932c3833736a56
parent 454241 8fecffa14e4d0c8a1c1e2716ff845d5305f85229
child 454243 ff8efa46c4602fa06bf9e1876e11ecde61d4338d
push id1648
push usermtabara@mozilla.com
push dateThu, 01 Mar 2018 12:45:47 +0000
treeherdermozilla-release@cbb9688c2eeb [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 - Drop 'undef None' macro in gfx. r=botond MozReview-Commit-ID: FGOEsZnu50u
gfx/layers/client/CanvasClient.h
--- a/gfx/layers/client/CanvasClient.h
+++ b/gfx/layers/client/CanvasClient.h
@@ -11,18 +11,16 @@
 #include "mozilla/Attributes.h"         // for override
 #include "mozilla/RefPtr.h"             // for RefPtr, already_AddRefed
 #include "mozilla/layers/CompositableClient.h"  // for CompositableClient
 #include "mozilla/layers/CompositorTypes.h"  // for TextureInfo, etc
 #include "mozilla/layers/LayersSurfaces.h"  // for SurfaceDescriptor
 #include "mozilla/layers/TextureClient.h"  // for TextureClient, etc
 #include "mozilla/layers/PersistentBufferProvider.h"
 
-// Fix X11 header brain damage that conflicts with MaybeOneOf::None
-#undef None
 #include "mozilla/MaybeOneOf.h"
 
 #include "mozilla/mozalloc.h"           // for operator delete
 
 #include "mozilla/gfx/Point.h"          // for IntSize
 #include "mozilla/gfx/Types.h"          // for SurfaceFormat
 
 namespace mozilla {