From 258b99426446ac7b12b6f5736362a9f7daa979de Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Tue, 29 Jan 2019 22:41:27 +0100 Subject: no need for this anymore --- test/monniaux/uzlib/compile.sh | 2 +- test/monniaux/uzlib/src/tinflate.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'test/monniaux') diff --git a/test/monniaux/uzlib/compile.sh b/test/monniaux/uzlib/compile.sh index 3a692061..2a27b963 100755 --- a/test/monniaux/uzlib/compile.sh +++ b/test/monniaux/uzlib/compile.sh @@ -1 +1 @@ -make CC=/home/monniaux/work/Kalray/CompCert/ccomp COPT="-Wall -O3 -U__SIZEOF_INT128__ -DUZLIB_NO_CALLBACK -U __SIZE_TYPE__ -D __SIZE_TYPE__='unsigned long long'" +make CC=/home/monniaux/work/Kalray/CompCert/ccomp COPT="-Wall -O3 -U__SIZEOF_INT128__ -U __SIZE_TYPE__ -D __SIZE_TYPE__='unsigned long long'" diff --git a/test/monniaux/uzlib/src/tinflate.c b/test/monniaux/uzlib/src/tinflate.c index cfb9b4c5..b93bc1fa 100644 --- a/test/monniaux/uzlib/src/tinflate.c +++ b/test/monniaux/uzlib/src/tinflate.c @@ -197,7 +197,6 @@ unsigned char uzlib_get_byte(TINF_DATA *d) return *d->source++; } -#ifndef UZLIB_NO_CALLBACK /* Otherwise if there's callback and we haven't seen EOF yet, try to read next byte using it. (Note: the callback can also update ->source and ->source_limit). */ @@ -207,7 +206,6 @@ unsigned char uzlib_get_byte(TINF_DATA *d) return (unsigned char)val; } } -#endif /* Otherwise, we hit EOF (either from ->readSource() or from exhaustion of the buffer), and it will be "sticky", i.e. further calls to this -- cgit