plainly marked altered files from zlib

diff --git a/zlibWrapper/Makefile b/zlibWrapper/Makefile
index c6f0617560d462fef850889b5bee94a47bc87620..41b334d32617bddc4887fd71d622a160bf7b5f66 100644 (file)
--- a/zlibWrapper/Makefile
+++ b/zlibWrapper/Makefile
@@ -8,6 +8,7 @@
 # Paths to static and dynamic zlib and zstd libraries
 # Use "make ZLIB_PATH=path/to/zlib ZLIB_LIBRARY=path/to/libz.a" to select a path to library
 ZLIB_LIBRARY ?= -lz
+ZLIB_PATH ?= .
 
 ZSTDLIBDIR = ../lib
 ZSTDLIBRARY = $(ZSTDLIBDIR)/libzstd.a

diff --git a/zlibWrapper/examples/example.c b/zlibWrapper/examples/example.c
index 9483129d23942c27703a3e3860723ab37eb1c216..9000f7a3295ecd5b4b44db4ed843a036bda8a421 100644 (file)
--- a/zlibWrapper/examples/example.c
+++ b/zlibWrapper/examples/example.c
@@ -1,8 +1,11 @@
+/* example.c contains minimal changes required to be compiled with zlibWrapper:
+ * - #include "zlib.h" was changed to #include "zstd_zlibwrapper.h"
+ * - test_flush() and test_sync() use functions not supported by zlibWrapper
+     therefore they are disabled while zstd compression is turned on     */
+
 /* example.c -- usage example of the zlib compression library
- * the file contains minimal changes required to be compiled with zstd wrapper for zlib
  */
-
- /*
+/*
   Copyright (c) 1995-2006, 2011 Jean-loup Gailly
 
  This software is provided 'as-is', without any express or implied

diff --git a/zlibWrapper/examples/fitblk.c b/zlibWrapper/examples/fitblk.c
index e3fda3c802c15dafc54906463701cfb371134c2f..760e338a2ba6d7dcd4e012c645e570faeb7eb1e8 100644 (file)
--- a/zlibWrapper/examples/fitblk.c
+++ b/zlibWrapper/examples/fitblk.c
@@ -1,3 +1,7 @@
+/* fitblk.c contains minimal changes required to be compiled with zlibWrapper:
+ * - #include "zlib.h" was changed to #include "zstd_zlibwrapper.h"
+ * - writing block to stdout was disabled                          */
+
 /* fitblk.c: example of fitting compressed output to a specified size
    Not copyrighted -- provided to the public domain
    Version 1.1  25 November 2004  Mark Adler */
@@ -54,7 +58,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-//#include "zlib.h"
 #include "zstd_zlibwrapper.h"
 
 #define LOG_FITBLK(...)   /*printf(__VA_ARGS__)*/

diff --git a/zlibWrapper/examples/minigzip.c b/zlibWrapper/examples/minigzip.c
index e56d5e1d721b7f4465ef35373d35397ad8415170..0ddc93f258462f0076ffa9264c8e8f94aa7ee539 100644 (file)
--- a/zlibWrapper/examples/minigzip.c
+++ b/zlibWrapper/examples/minigzip.c
@@ -1,3 +1,6 @@
+/* minigzip.c contains minimal changes required to be compiled with zlibWrapper:
+ * - #include "zlib.h" was changed to #include "zstd_zlibwrapper.h"        */
+
 /* minigzip.c -- simulate gzip using the zlib compression library
  * Copyright (C) 1995-2006, 2010, 2011 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h