Bug 1486040 - make WindowsDllBlocklist.h functional for aarch64 windows; r=aklotz
authorNathan Froyd <froydnj@mozilla.com>
Tue, 28 Aug 2018 09:27:57 -0400
changeset 488730 dd857ab01989843d0feae7eb4525b374e6a34439
parent 488729 3568c72a41cc0ffd616ad107dace0c9253d293d7
child 488731 1642245157667814068b0d39d3b03d74801cca8a
push id9734
push usershindli@mozilla.com
push dateThu, 30 Aug 2018 12:18:07 +0000
treeherdermozilla-beta@71c71ab3afae [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaklotz
bugs1486040
milestone63.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 1486040 - make WindowsDllBlocklist.h functional for aarch64 windows; r=aklotz
mozglue/build/WindowsDllBlocklist.h
--- a/mozglue/build/WindowsDllBlocklist.h
+++ b/mozglue/build/WindowsDllBlocklist.h
@@ -1,17 +1,18 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* 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_windowsdllblocklist_h
 #define mozilla_windowsdllblocklist_h
 
-#if (defined(_MSC_VER) || defined(__MINGW32__))  && (defined(_M_IX86) || defined(_M_X64))
+#if (defined(_MSC_VER) || defined(__MINGW32__)) && \
+  (defined(_M_IX86) || defined(_M_X64) || defined(_M_ARM64))
 
 #include <windows.h>
 #ifdef ENABLE_TESTS
 #include <winternl.h>
 #endif // ENABLE_TESTS
 #include "mozilla/Attributes.h"
 #include "mozilla/Types.h"