From 343ece4eb1a92b5d7132783969e4bc31e4192db0 Mon Sep 17 00:00:00 2001 From: pixel Date: Mon, 10 Mar 2003 02:40:24 +0000 Subject: Zlib mingw32 hack --- lib/Handle.cc | 4 ++++ lib/Makefile.sol.mingw | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/Handle.cc b/lib/Handle.cc index e3ed198..b894fe2 100644 --- a/lib/Handle.cc +++ b/lib/Handle.cc @@ -197,6 +197,10 @@ void Handle::close() throw (GeneralException) { if (err == Z_ERRNO) { throw GeneralException(String(_("Error during close: ")) + strerror(errno)); } else { +#ifdef IGNOREZDATAONCLOSE + if (err == Z_DATA_ERROR) + return; +#endif throw GeneralException(String(_("Error in zlib during gzclose: ")) + gzerror(zfile, &err)); } } diff --git a/lib/Makefile.sol.mingw b/lib/Makefile.sol.mingw index d4685e5..3249192 100644 --- a/lib/Makefile.sol.mingw +++ b/lib/Makefile.sol.mingw @@ -2,7 +2,7 @@ CC = i586-mingw32msvc-gcc CXX = i586-mingw32msvc-g++ AR = i586-mingw32msvc-ar RANLIB = i586-mingw32msvc-ranlib -CPPFLAGS = -I../include -DFORCE64 -O3 -mwindows -D_REENTRANT -I/usr/local/win32/include -I../../extra/regex +CPPFLAGS = -I../include -DFORCE64 -O3 -mwindows -D_REENTRANT -I/usr/local/win32/include -I../../extra/regex -DIGNOREZDATAONCLOSE OBJECTS = Buffer.o Exceptions.o Handle.o Image.o Input.o Main.o Output.o \ Regex.o String.o checkargs.o datecalc.o fileutils.o generic.o TARGET = Baltisot-sol.a -- cgit v1.2.3