Bug 1498694 Revert the patch that relaxes the MSVC requirement (1431807) since mingw-clang passes it now r=bobowen
authorTom Ritter <tom@mozilla.com>
Fri, 12 Oct 2018 13:45:49 -0500
changeset 489662 414fe669452a2203910fb8da59fcdf211a249ca9
parent 489661 e1f69bad9ab0d850d7fc9804321fac80a8a4a8ed
child 489663 a49f77c868163991c7d1bee5d73dd6716bbca577
push id247
push userfmarier@mozilla.com
push dateSat, 27 Oct 2018 01:06:44 +0000
reviewersbobowen
bugs1498694, 1431807
milestone64.0a1
Bug 1498694 Revert the patch that relaxes the MSVC requirement (1431807) since mingw-clang passes it now r=bobowen
security/sandbox/chromium-shim/patches/with_update/mingw_msvc_requirement_error.patch
security/sandbox/chromium-shim/patches/with_update/patch_order.txt
security/sandbox/chromium/base/win/windows_version.cc
deleted file mode 100644
--- a/security/sandbox/chromium-shim/patches/with_update/mingw_msvc_requirement_error.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User Tom Ritter <tom@mozilla.com>
-# Date 1504104514 18000
-#      Wed Aug 30 09:48:34 2017 -0500
-# Node ID bfcfd788617b9cff6d08a5783a0ece0681fbf523
-# Parent  926edfc5eb283736573cc1cc16ef82646ad8b330
-Bug 1431807 Allow MinGW and silence warning about Windows SDK version r?bobowen
-
-MozReview-Commit-ID: 3aVeqSzRGXB
-
-diff --git a/security/sandbox/chromium/base/win/windows_version.cc b/security/sandbox/chromium/base/win/windows_version.cc
---- a/security/sandbox/chromium/base/win/windows_version.cc
-+++ b/security/sandbox/chromium/base/win/windows_version.cc
-@@ -9,17 +9,17 @@
- #include <memory>
- 
- #include "base/file_version_info_win.h"
- #include "base/files/file_path.h"
- #include "base/logging.h"
- #include "base/strings/utf_string_conversions.h"
- #include "base/win/registry.h"
- 
--#if !defined(__clang__) && _MSC_FULL_VER < 190024213
-+#if !defined(__MINGW32__) && !defined(__clang__) && _MSC_FULL_VER < 190024213
- #error VS 2015 Update 3 with Cumulative Servicing Release or higher is required
- #endif
- 
- namespace {
- typedef BOOL (WINAPI *GetProductInfoPtr)(DWORD, DWORD, DWORD, DWORD, PDWORD);
- }  // namespace
- 
- namespace base {
--- a/security/sandbox/chromium-shim/patches/with_update/patch_order.txt
+++ b/security/sandbox/chromium-shim/patches/with_update/patch_order.txt
@@ -8,15 +8,14 @@ add_option_to_not_use_restricting_sids.p
 ifdef_out_SequenceChecker_code.patch
 revert_c++14_typename_alias_usage.patch
 revert_c++14_index_sequence_usage.patch
 fix_Wcomma_warning_in_time_cc.patch
 allow_read_only_all_paths_rule.patch
 revert_TargetNtSetInformationThread_change.patch
 mingw_base_win_get_caller.patch
 mingw_duplicate_instatinations.patch
-mingw_msvc_requirement_error.patch
 mingw_copy_s.patch
 mingw_operator_new.patch
 mingw_cast_getprocaddress.patch
 mingw_capitalization.patch
 mingw_noexports_casts.patch
 mingw_offsetof.patch
--- a/security/sandbox/chromium/base/win/windows_version.cc
+++ b/security/sandbox/chromium/base/win/windows_version.cc
@@ -9,17 +9,17 @@
 #include <memory>
 
 #include "base/file_version_info_win.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 
-#if !defined(__MINGW32__) && !defined(__clang__) && _MSC_FULL_VER < 190024213
+#if !defined(__clang__) && _MSC_FULL_VER < 190024213
 #error VS 2015 Update 3 with Cumulative Servicing Release or higher is required
 #endif
 
 namespace {
 typedef BOOL (WINAPI *GetProductInfoPtr)(DWORD, DWORD, DWORD, DWORD, PDWORD);
 }  // namespace
 
 namespace base {