fixed g++ prototype mismatch

diff --git a/Makefile b/Makefile
index 54652665bc7670c269ea2c5d4a18dd3a4255e622..d7a00e43180a7ca358086600ae13c70f92d5f07d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -108,7 +108,7 @@ clean:
 #------------------------------------------------------------------------------
 # make install is validated only for Linux, OSX, Hurd and some BSD targets
 #------------------------------------------------------------------------------
-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly NetBSD))
+ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly NetBSD MSYS_NT))
 
 HOST_OS = POSIX
 CMAKE_PARAMS = -DZSTD_BUILD_CONTRIB:BOOL=ON -DZSTD_BUILD_STATIC:BOOL=ON -DZSTD_BUILD_TESTS:BOOL=ON -DZSTD_ZLIB_SUPPORT:BOOL=ON -DZSTD_LZMA_SUPPORT:BOOL=ON

diff --git a/lib/common/zstd_internal.h b/lib/common/zstd_internal.h
index e67157c13c12f0065cd4c3192c1845c5ee8cf236..bd2ad10ff2c2b24fa54bfbcd0b128121c927f1ea 100644 (file)
--- a/lib/common/zstd_internal.h
+++ b/lib/common/zstd_internal.h
@@ -324,9 +324,9 @@ size_t ZSTD_compressBegin_internal(ZSTD_CCtx* cctx,
  *  must receive dict, or cdict, or none, but not both.
  *  @return : 0, or an error code */
 size_t ZSTD_initCStream_internal(ZSTD_CStream* zcs,
-                           const void* dict, size_t dictSize,
-                           const ZSTD_CDict* cdict,
-                           ZSTD_parameters params, U64 pledgedSrcSize);
+                     const void* dict, size_t dictSize,
+                     const ZSTD_CDict* cdict,
+                     ZSTD_parameters params, unsigned long long pledgedSrcSize);
 
 
 /*! ZSTD_getParamsFromCDict() :

diff --git a/programs/windres/zstd32.res b/programs/windres/zstd32.res
index b5dd78db717ce9c7ddb2f69a9bc81804e51aedf6..d6caf985ed2a9469d7a06c8518fc8af5780e34d5 100644 (file)
Binary files a/programs/windres/zstd32.res and b/programs/windres/zstd32.res differ

diff --git a/programs/windres/zstd64.res b/programs/windres/zstd64.res
index 32aff55428f08cec0d4bf084a8666cec1c56809c..5b1c73bf26f39c941f93ae3269f46c42c9ad6a61 100644 (file)
Binary files a/programs/windres/zstd64.res and b/programs/windres/zstd64.res differ