diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-06-06 02:35:14 +0800 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-06-05 11:35:14 -0700 |
| commit | b3b526afc70660ee983eb0641d6b6142fa7afa78 (patch) | |
| tree | 9b05a936d8e55aa2732de77300717c0e2b4e3bb7 /ports/xxhash/fix-arm-uwp.patch | |
| parent | e633c4c45e83b2febd1ddb115d5b64e59c1c99b5 (diff) | |
| download | vcpkg-b3b526afc70660ee983eb0641d6b6142fa7afa78.tar.gz vcpkg-b3b526afc70660ee983eb0641d6b6142fa7afa78.zip | |
[xxhash]Upgrade version to 0.7.0 and fix arm/uwp build errors. (#6750)
Diffstat (limited to 'ports/xxhash/fix-arm-uwp.patch')
| -rw-r--r-- | ports/xxhash/fix-arm-uwp.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/ports/xxhash/fix-arm-uwp.patch b/ports/xxhash/fix-arm-uwp.patch new file mode 100644 index 000000000..51bbc7474 --- /dev/null +++ b/ports/xxhash/fix-arm-uwp.patch @@ -0,0 +1,34 @@ +diff --git a/xxh3.h b/xxh3.h +index 0972c46..e5c7101 100644 +--- a/xxh3.h ++++ b/xxh3.h +@@ -40,7 +40,7 @@ + #ifndef XXH3_H + #define XXH3_H + +- ++#pragma warning (disable : 4146) + /* === Dependencies === */ + + #undef XXH_INLINE_ALL /* in case it's already defined */ +@@ -97,7 +97,7 @@ + #endif + + /* U64 XXH_mult32to64(U32 a, U64 b) { return (U64)a * (U64)b; } */ +-#ifdef _MSC_VER ++#if defined(_MSC_VER) && (!_WIN32_WINNT >= 0x0A00) + # include <intrin.h> + /* MSVC doesn't do a good job with the mull detection. */ + # define XXH_mult32to64 __emulu +diff --git a/xxhsum.c b/xxhsum.c +index 0ec11c0..7d39c24 100644 +--- a/xxhsum.c ++++ b/xxhsum.c +@@ -31,6 +31,7 @@ + #ifndef XXHASH_C_2097394837 + #define XXHASH_C_2097394837 + ++#pragma warning (disable : 4146) + /* ************************************ + * Compiler Options + **************************************/ |