Bug 1431295 - Drop 'undef None' macro in dom/. r=baku
authorHiroyuki Ikezoe <hikezoe@mozilla.com>
Thu, 18 Jan 2018 14:12:51 +0900
changeset 454244 25d33cd4ed83d2f8abe6a8c46165e957b0ea5030
parent 454243 ff8efa46c4602fa06bf9e1876e11ecde61d4338d
child 454245 a984a3218ffe8ebaad26bff890bc25f00612d859
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)
reviewersbaku
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 dom/. r=baku MozReview-Commit-ID: Fmd4A2c7yUu
dom/clients/manager/ClientIPCUtils.h
dom/fetch/FetchIPCTypes.h
--- a/dom/clients/manager/ClientIPCUtils.h
+++ b/dom/clients/manager/ClientIPCUtils.h
@@ -3,19 +3,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #ifndef _mozilla_dom_ClientIPCUtils_h
 #define _mozilla_dom_ClientIPCUtils_h
 
 #include "ipc/IPCMessageUtils.h"
 
-// Fix X11 header brain damage that conflicts with FrameType::None
-#undef None
-
 #include "mozilla/dom/ClientBinding.h"
 #include "mozilla/dom/ClientsBinding.h"
 #include "mozilla/dom/DocumentBinding.h"
 #include "nsContentUtils.h"
 
 namespace IPC {
   template<>
   struct ParamTraits<mozilla::dom::ClientType> :
--- a/dom/fetch/FetchIPCTypes.h
+++ b/dom/fetch/FetchIPCTypes.h
@@ -4,19 +4,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_dom_fetch_IPCUtils_h
 #define mozilla_dom_fetch_IPCUtils_h
 
 #include "ipc/IPCMessageUtils.h"
 
-// Fix X11 header brain damage that conflicts with HeadersGuardEnum::None
-#undef None
-
 #include "mozilla/dom/HeadersBinding.h"
 #include "mozilla/dom/RequestBinding.h"
 #include "mozilla/dom/ResponseBinding.h"
 
 namespace IPC {
   template<>
   struct ParamTraits<mozilla::dom::HeadersGuardEnum> :
     public ContiguousEnumSerializer<mozilla::dom::HeadersGuardEnum,