diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-04 10:13:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-04 10:13:15 +0100 |
| commit | bdbcf29246bad902e94c3a5fb1fd1abb06aeb2ae (patch) | |
| tree | c85c2c9a80d04e338cf39d0fed3fdba2d0291b29 /thirdparty/zstd/1314.diff | |
| parent | b1e3215f3a316cfaf518747f7dafba4cc0d8d291 (diff) | |
| parent | e64391f47bf95ab4cdb65683623979ee6790836e (diff) | |
Merge pull request #24754 from guilhermefelipecgs/fix_17374
Update zstd to 1.3.8
Diffstat (limited to 'thirdparty/zstd/1314.diff')
| -rw-r--r-- | thirdparty/zstd/1314.diff | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/thirdparty/zstd/1314.diff b/thirdparty/zstd/1314.diff deleted file mode 100644 index c9f4efadbf..0000000000 --- a/thirdparty/zstd/1314.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/common/cpu.h b/common/cpu.h -index 88e0ebf44..eeb428ad5 100644 ---- a/common/cpu.h -+++ b/common/cpu.h -@@ -36,7 +36,7 @@ MEM_STATIC ZSTD_cpuid_t ZSTD_cpuid(void) { - U32 f1d = 0; - U32 f7b = 0; - U32 f7c = 0; --#ifdef _MSC_VER -+#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86)) - int reg[4]; - __cpuid((int*)reg, 0); - { |