remove 1431295-4-59a1.patch

mozilla-release/patches/1431295-4-59a1.patch

@@ -1,55 +0,0 @@
-# HG changeset patch
-# User Hiroyuki Ikezoe <hikezoe@mozilla.com>
-# Date 1516252371 -32400
-# Node ID 25d33cd4ed83d2f8abe6a8c46165e957b0ea5030
-# Parent  e7ff5f6acfcfbc9c89c1f7b0141a9203a04afdff
-Bug 1431295 - Drop 'undef None' macro in dom/. r=baku
-
-MozReview-Commit-ID: Fmd4A2c7yUu
-
-diff --git a/dom/clients/manager/ClientIPCUtils.h b/dom/clients/manager/ClientIPCUtils.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"
- 
- namespace IPC {
-   template<>
-   struct ParamTraits<mozilla::dom::ClientType> :
-     public ContiguousEnumSerializer<mozilla::dom::ClientType,
-diff --git a/dom/fetch/FetchIPCTypes.h b/dom/fetch/FetchIPCTypes.h
---- 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,

mozilla-release/patches/series

@@ -8397,7 +8397,6 @@ TOP-NOBUG-revendor-25318.patch
 1431295-1-59a1.patch
 1431295-2-59a1.patch
 1431295-3-59a1.patch
-1431295-4-59a1.patch
 1418361-60a1.patch
 1431052-60a1.patch
 1432414-60a1.patch