From e02808ffc5776a0a0f0c97001b0bcf49aacb19b1 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Wed, 20 Apr 2016 22:46:16 +0200 Subject: [PATCH] bumped lib version to 0.6.1 added ZSTD_VERSION_STRING --- lib/zstd.h | 12 +++++++++--- programs/zstdcli.c | 7 ++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/zstd.h b/lib/zstd.h index 26c6e275f..7b5708c42 100644 --- a/lib/zstd.h +++ b/lib/zstd.h @@ -59,9 +59,15 @@ extern "C" { /* ************************************* * Version ***************************************/ -#define ZSTD_VERSION_MAJOR 0 /* for breaking interface changes */ -#define ZSTD_VERSION_MINOR 6 /* for new (non-breaking) interface capabilities */ -#define ZSTD_VERSION_RELEASE 0 /* for tweaks, bug-fixes, or development */ +#define ZSTD_VERSION_MAJOR 0 +#define ZSTD_VERSION_MINOR 6 +#define ZSTD_VERSION_RELEASE 1 + +#define ZSTD_LIB_VERSION ZSTD_VERSION_MAJOR.ZSTD_VERSION_MINOR.ZSTD_VERSION_RELEASE +#define ZSTD_QUOTE(str) #str +#define ZSTD_EXPAND_AND_QUOTE(str) ZSTD_QUOTE(str) +#define ZSTD_VERSION_STRING ZSTD_EXPAND_AND_QUOTE(ZSTD_LIB_VERSION) + #define ZSTD_VERSION_NUMBER (ZSTD_VERSION_MAJOR *100*100 + ZSTD_VERSION_MINOR *100 + ZSTD_VERSION_RELEASE) ZSTDLIB_API unsigned ZSTD_versionNumber (void); diff --git a/programs/zstdcli.c b/programs/zstdcli.c index 3019edcf2..e11b0c325 100644 --- a/programs/zstdcli.c +++ b/programs/zstdcli.c @@ -71,10 +71,7 @@ **************************************/ #define COMPRESSOR_NAME "zstd command line interface" #ifndef ZSTD_VERSION -# define LIB_VERSION ZSTD_VERSION_MAJOR.ZSTD_VERSION_MINOR.ZSTD_VERSION_RELEASE -# define QUOTE(str) #str -# define EXPAND_AND_QUOTE(str) QUOTE(str) -# define ZSTD_VERSION "v" EXPAND_AND_QUOTE(LIB_VERSION) +# define ZSTD_VERSION "v" ZSTD_VERSION_STRING #endif #define AUTHOR "Yann Collet" #define WELCOME_MESSAGE "*** %s %i-bits %s, by %s ***\n", COMPRESSOR_NAME, (int)(sizeof(void*)*8), ZSTD_VERSION, AUTHOR @@ -87,7 +84,7 @@ #define MB *(1 <<20) #define GB *(1U<<30) -static const char* g_defaultDictName = "dictionary"; +static const char* g_defaultDictName = "dictionary"; static const unsigned g_defaultMaxDictSize = 110 KB; static const unsigned g_defaultDictCLevel = 5; static const unsigned g_defaultSelectivityLevel = 9;