7-Zip 16.02 with Zstd 0.7.1 release

C/zstd/zbuff_static.h

@@ -47,11 +47,6 @@ extern "C" {
 #include "zstd_static.h"     /* ZSTD_parameters */
 #include "zbuff.h"
 
-/*-*************************************
-*  Common macros
-***************************************/
-#define MIN(a,b) ((a)<(b) ? (a) : (b))
-#define MAX(a,b) ((a)>(b) ? (a) : (b))
 
 /* *************************************
 *  Advanced Streaming functions

C/zstd/zstd.h

@@ -41,6 +41,11 @@ extern "C" {
 ***************************************/
 #include <stddef.h>   /* size_t */
 
+/*-*************************************
+*  Common macros
+***************************************/
+#define MIN(a,b) ((a)<(b) ? (a) : (b))
+#define MAX(a,b) ((a)>(b) ? (a) : (b))
 
 /*-***************************************************************
 *  Export parameters

C/zstd/zstd_internal.h

@@ -40,7 +40,6 @@
 #define ZSTD_STATIC_LINKING_ONLY
 #include "zstd.h"
 
-
 /*-*************************************
 *  Common constants
 ***************************************/

C/zstd/zstd_static.h

@@ -47,13 +47,11 @@ extern "C" {
 #include "zstd.h"
 #include "mem.h"
 
-
 /*-*************************************
 *  Constants
 ***************************************/
 #define ZSTD_MAGICNUMBER 0xFD2FB526   /* v0.6 */
 
-
 /*-*************************************
 *  Types
 ***************************************/

CPP/7zip/Bundles/SFXCon/makefile

@@ -130,6 +130,7 @@ ZSTD_OBJS = \
   $O\zbuff_decompress.obj \
   $O\zstd_common.obj \
   $O\zstd_decompress.obj \
+  $O\xxhash.obj \
 
 !include "../../Aes.mak"
 !include "../../Crc.mak"

CPP/7zip/Bundles/SFXWin/makefile

@@ -149,6 +149,7 @@ ZSTD_OBJS = \
   $O\zbuff_decompress.obj \
   $O\zstd_common.obj \
   $O\zstd_decompress.obj \
+  $O\xxhash.obj \
 
 !include "../../Aes.mak"
 !include "../../Crc.mak"