diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-07-25 20:27:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-25 20:27:58 +0200 |
| commit | a12fa5b879b4a620024433b18c72af46b6e2c90e (patch) | |
| tree | 19d7e614f96e5cb936d5e6ed56b44def7a8b69f5 /thirdparty | |
| parent | ee7188fe56018c5f81c0e9c2334e1fd50cebd262 (diff) | |
| parent | 9db39d72fa6b49aba1d38c7e26e82b280e2055e1 (diff) | |
Merge pull request #9847 from vnen/patch-zstd
zstd: Apply upstream patch to fix UWP ARM build
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/zstd/common/zstd_internal.h | 12 | ||||
| -rw-r--r-- | thirdparty/zstd/decompress/zstd_decompress.c | 9 |
2 files changed, 13 insertions, 8 deletions
diff --git a/thirdparty/zstd/common/zstd_internal.h b/thirdparty/zstd/common/zstd_internal.h index f2c4e6249f..49a4796476 100644 --- a/thirdparty/zstd/common/zstd_internal.h +++ b/thirdparty/zstd/common/zstd_internal.h @@ -331,4 +331,16 @@ size_t ZSTD_compressStream_generic(ZSTD_CStream* zcs, ZSTD_parameters ZSTD_getParamsFromCDict(const ZSTD_CDict* cdict); +typedef struct { + blockType_e blockType; + U32 lastBlock; + U32 origSize; +} blockProperties_t; + +/*! ZSTD_getcBlockSize() : + * Provides the size of compressed block from block header `src` */ + size_t ZSTD_getcBlockSize(const void* src, size_t srcSize, + blockProperties_t* bpPtr); + + #endif /* ZSTD_CCOMMON_H_MODULE */ diff --git a/thirdparty/zstd/decompress/zstd_decompress.c b/thirdparty/zstd/decompress/zstd_decompress.c index 003d703a5e..465bcc20b5 100644 --- a/thirdparty/zstd/decompress/zstd_decompress.c +++ b/thirdparty/zstd/decompress/zstd_decompress.c @@ -53,7 +53,7 @@ # include "zstd_legacy.h" #endif -#if defined(_MSC_VER) && !defined(_M_IA64) /* _mm_prefetch() is not defined for ia64 */ +#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_I86)) /* _mm_prefetch() is not defined outside of x86/x64 */ # include <mmintrin.h> /* https://msdn.microsoft.com/fr-fr/library/84szxsww(v=vs.90).aspx */ # define ZSTD_PREFETCH(ptr) _mm_prefetch((const char*)ptr, _MM_HINT_T0) #elif defined(__GNUC__) @@ -466,13 +466,6 @@ static size_t ZSTD_decodeFrameHeader(ZSTD_DCtx* dctx, const void* src, size_t he } -typedef struct -{ - blockType_e blockType; - U32 lastBlock; - U32 origSize; -} blockProperties_t; - /*! ZSTD_getcBlockSize() : * Provides the size of compressed block from block header `src` */ size_t ZSTD_getcBlockSize(const void* src, size_t srcSize, |