facebook
/
zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #532 from terrelln/zlib 

Change zlib include to be a system include
dev
Yann Collet 2017-02-06 14:44:23 -08:00 committed by GitHub
parent d44d363ec1 7e3fc73795
commit 696a749d30
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/Makefile
View File

@ -67,7 +67,7 @@ endif
# zlib detection # zlib detection
VOID = /dev/null VOID = /dev/null
HAVE_ZLIB := $(shell echo "int main(){}" | $(CC) -o $(VOID) -x c - -lz 2> $(VOID) && echo 1 || echo 0) HAVE_ZLIB := $(shell echo "\#include <zlib.h>\nint main(){}" | $(CC) -o $(VOID) -x c - -lz 2> $(VOID) && echo 1 || echo 0)
ifeq ($(HAVE_ZLIB), 1) ifeq ($(HAVE_ZLIB), 1)
ZLIBCPP = -DZSTD_GZDECOMPRESS ZLIBCPP = -DZSTD_GZDECOMPRESS
ZLIBLD = -lz ZLIBLD = -lz

2
programs/fileio.c
View File

@ -39,7 +39,7 @@
# include "zstdmt_compress.h" # include "zstdmt_compress.h"
#endif #endif
#ifdef ZSTD_GZDECOMPRESS #ifdef ZSTD_GZDECOMPRESS
# include "zlib.h" # include <zlib.h>
# if !defined(z_const) # if !defined(z_const)
# define z_const # define z_const
# endif # endif