diff options
| author | Connor McLaughlin <stenzek@gmail.com> | 2019-12-28 19:27:47 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-28 19:27:47 +1000 |
| commit | 084344aa5d9a39fc05cfe952005e530766c3c29c (patch) | |
| tree | 475743122047bf92e00afd44711ef9be65e43565 /Source/Core/Common/Hash.cpp | |
| parent | 0755f9297957881e5c487378a7ba0a9fe92cbd42 (diff) | |
| parent | d744c5a148f5a477b41b63bceac0558a498ef989 (diff) | |
Merge pull request #8495 from stenzek/windows-arm64
Platform support for Windows-on-ARM64
Diffstat (limited to 'Source/Core/Common/Hash.cpp')
| -rw-r--r-- | Source/Core/Common/Hash.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Common/Hash.cpp b/Source/Core/Common/Hash.cpp index 193ff5257b..ea2375f3c7 100644 --- a/Source/Core/Common/Hash.cpp +++ b/Source/Core/Common/Hash.cpp @@ -11,7 +11,7 @@ #include "Common/CommonFuncs.h" #include "Common/Intrinsics.h" -#ifdef _M_ARM_64 +#if defined(_M_ARM_64) && !defined(_MSC_VER) #include <arm_acle.h> #endif |