AuroraMiddleware/zstd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed library compilation

Browse Source
This commit is contained in:
Yann Collet 2015-11-11 14:39:50 +01:00
parent 5be2dd25f2
commit 7f6e91fa98
7 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -32,7 +32,7 @@
# ################################################################ # ################################################################
# Version number # Version number
export VERSION := 0.3.6 export VERSION := 0.4.0
PRGDIR = programs PRGDIR = programs
ZSTDDIR = lib ZSTDDIR = lib

3
NEWS
View File

@ -1,3 +1,6 @@
v0.4.0
Removed zstdhc => merged into zstd
v0.3.6 v0.3.6
small blocks params small blocks params

4
lib/Makefile
View File

@ -67,10 +67,10 @@ default: libzstd
all: libzstd all: libzstd
libzstd: zstd.c huff0.c fse.c libzstd: zstd_compress.c zstd_decompress.c huff0.c fse.c
@echo compiling static library @echo compiling static library
@$(CC) $(FLAGS) -c $^ @$(CC) $(FLAGS) -c $^
@$(AR) rcs libzstd.a zstd.o huff0.o fse.o @$(AR) rcs libzstd.a zstd_compress.o zstd_decompress.o huff0.o fse.o
@echo compiling dynamic library $(LIBVER) @echo compiling dynamic library $(LIBVER)
@$(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER) @$(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
@echo creating versioned links @echo creating versioned links

4
lib/zstd.h
View File

@ -47,8 +47,8 @@ extern "C" {
* Version * Version
***************************************/ ***************************************/
#define ZSTD_VERSION_MAJOR 0 /* for breaking interface changes */ #define ZSTD_VERSION_MAJOR 0 /* for breaking interface changes */
#define ZSTD_VERSION_MINOR 3 /* for new (non-breaking) interface capabilities */ #define ZSTD_VERSION_MINOR 4 /* for new (non-breaking) interface capabilities */
#define ZSTD_VERSION_RELEASE 6 /* for tweaks, bug-fixes, or development */ #define ZSTD_VERSION_RELEASE 0 /* for tweaks, bug-fixes, or development */
#define ZSTD_VERSION_NUMBER (ZSTD_VERSION_MAJOR *100*100 + ZSTD_VERSION_MINOR *100 + ZSTD_VERSION_RELEASE) #define ZSTD_VERSION_NUMBER (ZSTD_VERSION_MAJOR *100*100 + ZSTD_VERSION_MINOR *100 + ZSTD_VERSION_RELEASE)
unsigned ZSTD_versionNumber (void); unsigned ZSTD_versionNumber (void);

4
lib/zstd_decompress.c
View File

@ -123,10 +123,6 @@
#define IS_RAW BIT0 #define IS_RAW BIT0
#define IS_RLE BIT1 #define IS_RLE BIT1
static const U32 g_maxDistance = 4 * BLOCKSIZE;
static const U32 g_maxLimit = 1 GB;
#define WORKPLACESIZE (BLOCKSIZE*3)
#define MINMATCH 4 #define MINMATCH 4
#define LitFSELog 11 #define LitFSELog 11
#define MLFSELog 10 #define MLFSELog 10

2
programs/bench.h
View File

@ -26,7 +26,7 @@
/* Main function */ /* Main function */
int BMK_benchFiles(char** fileNamesTable, unsigned nbFiles, unsigned cLevel); int BMK_benchFiles(const char** fileNamesTable, unsigned nbFiles, unsigned cLevel);
/* Set Parameters */ /* Set Parameters */
void BMK_SetNbIterations(int nbLoops); void BMK_SetNbIterations(int nbLoops);

8
programs/zstdcli.c
View File

@ -163,7 +163,7 @@ static void waitEnter(void)
} }
int main(int argc, char** argv) int main(int argCount, const char** argv)
{ {
int i, int i,
bench=0, bench=0,
@ -196,9 +196,9 @@ int main(int argc, char** argv)
decode=1; decode=1;
/* command switches */ /* command switches */
for(i=1; i<argc; i++) for(i=1; i<argCount; i++)
{ {
char* argument = argv[i]; const char* argument = argv[i];
if(!argument) continue; /* Protection if argument empty */ if(!argument) continue; /* Protection if argument empty */
@ -311,7 +311,7 @@ int main(int argc, char** argv)
} }
/* first provided filename is input */ /* first provided filename is input */
if (!inFileName) { inFileName = argument; fileNameStart = i; nbFiles = argc-i; continue; } if (!inFileName) { inFileName = argument; fileNameStart = i; nbFiles = argCount-i; continue; }
/* second provided filename is output */ /* second provided filename is output */
if (!outFileName) if (!outFileName)