Bug 1431807 Allow MinGW and silence warning about Windows SDK version r?bobowen draft
authorTom Ritter <tom@mozilla.com>
Wed, 30 Aug 2017 09:48:34 -0500
changeset 722750 c64ea5b2e26b203eff2f0b9d85fef99ae3a094f9
parent 722749 926edfc5eb283736573cc1cc16ef82646ad8b330
child 722757 4c8d460dd1d0d6bfde2fef897f34a7918be42053
push id96228
push userbmo:tom@mozilla.com
push dateFri, 19 Jan 2018 19:40:17 +0000
reviewersbobowen
bugs1431807
milestone59.0a1
Bug 1431807 Allow MinGW and silence warning about Windows SDK version r?bobowen MozReview-Commit-ID: 3aVeqSzRGXB
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
new file mode 100644
--- /dev/null
+++ b/security/sandbox/chromium-shim/patches/with_update/mingw_msvc_requirement_error.patch
@@ -0,0 +1,32 @@
+# 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,8 +8,9 @@ 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
\ No newline at end of file
--- 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 {