From: cyan4973 Date: Mon, 5 Jun 2017 06:52:00 +0000 (-0700) Subject: fixed g++ prototype mismatch X-Git-Tag: v1.3.0~1^2~17^2~53 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bcbf42617c7cdda17911614d54e61b6e41cfc34;p=thirdparty%2Fzstd.git fixed g++ prototype mismatch --- diff --git a/Makefile b/Makefile index 54652665b..d7a00e431 100644 --- 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 e67157c13..bd2ad10ff 100644 --- 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 b5dd78db7..d6caf985e 100644 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 32aff5542..5b1c73bf2 100644 Binary files a/programs/windres/zstd64.res and b/programs/windres/zstd64.res differ