From: Yann Collet <yann.collet.73@gmail.com>
Date: Tue, 6 Dec 2016 07:52:53 +0000 (+0100)
Subject: fixed zlibwrapper use of xxh
X-Git-Tag: v1.1.2~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f902f946c828f8338e341281eedbd913816a4d3;p=thirdparty%2Fzstd.git

fixed zlibwrapper use of xxh
---

diff --git a/zlibWrapper/.gitignore b/zlibWrapper/.gitignore
index c3376bad8..8ce15613c 100644
--- a/zlibWrapper/.gitignore
+++ b/zlibWrapper/.gitignore
@@ -2,11 +2,14 @@
 _*
 example.*
 example_zstd.*
+example_gz.*
 fitblk.*
 fitblk_zstd.*
 zwrapbench.*
 foo.gz
 
+minigzip
+minigzip_zstd
 example
 example_zstd
 fitblk
diff --git a/zlibWrapper/Makefile b/zlibWrapper/Makefile
index 49d44e35a..a0e641d94 100644
--- a/zlibWrapper/Makefile
+++ b/zlibWrapper/Makefile
@@ -13,12 +13,12 @@ ZLIB_PATH ?= .
 ZSTDLIBDIR = ../lib
 ZSTDLIBRARY = $(ZSTDLIBDIR)/libzstd.a
 ZLIBWRAPPER_PATH = .
-GZFILES = gzclose.o gzlib.o gzread.o gzwrite.o 
+GZFILES = gzclose.o gzlib.o gzread.o gzwrite.o
 EXAMPLE_PATH = examples
 PROGRAMS_PATH = ../programs
 TEST_FILE = ../doc/zstd_compression_format.md
 
-CPPFLAGS = -DXXH_NAMESPACE=XXH_ -I$(ZLIB_PATH) -I$(PROGRAMS_PATH) -I$(ZSTDLIBDIR) -I$(ZSTDLIBDIR)/common -I$(ZLIBWRAPPER_PATH)
+CPPFLAGS = -DXXH_NAMESPACE=ZSTD_ -I$(ZLIB_PATH) -I$(PROGRAMS_PATH) -I$(ZSTDLIBDIR) -I$(ZSTDLIBDIR)/common -I$(ZLIBWRAPPER_PATH)
 CFLAGS  ?= $(MOREFLAGS) -O3 -std=gnu99
 CFLAGS  += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef -Wstrict-aliasing=1