From: Nick Terrell <terrelln@fb.com>
Date: Wed, 8 Mar 2017 23:40:13 +0000 (-0800)
Subject: Remove 'mem.h' dependency from ZSTD_WINDOWLOG_MAX
X-Git-Tag: v1.1.4~1^2~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F595%2Fhead;p=thirdparty%2Fzstd.git

Remove 'mem.h' dependency from ZSTD_WINDOWLOG_MAX
---

diff --git a/lib/zstd.h b/lib/zstd.h
index f462d0997..0b48b7ec6 100644
--- a/lib/zstd.h
+++ b/lib/zstd.h
@@ -345,7 +345,7 @@ ZSTDLIB_API size_t ZSTD_DStreamOutSize(void);   /*!< recommended size for output
 
 #define ZSTD_WINDOWLOG_MAX_32  27
 #define ZSTD_WINDOWLOG_MAX_64  27
-#define ZSTD_WINDOWLOG_MAX    ((U32)(MEM_32bits() ? ZSTD_WINDOWLOG_MAX_32 : ZSTD_WINDOWLOG_MAX_64))
+#define ZSTD_WINDOWLOG_MAX    ((unsigned)(sizeof(size_t) == 4 ? ZSTD_WINDOWLOG_MAX_32 : ZSTD_WINDOWLOG_MAX_64))
 #define ZSTD_WINDOWLOG_MIN     10
 #define ZSTD_HASHLOG_MAX       ZSTD_WINDOWLOG_MAX
 #define ZSTD_HASHLOG_MIN        6