summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpixel <pixel>2003-03-10 02:43:04 +0000
committerpixel <pixel>2003-03-10 02:43:04 +0000
commit48cbd1ff8dd5aa4025eee6e244a83bab3eb396d0 (patch)
tree2f110a1c960491405532fec2fe3b4dccc3eb9d42
parent343ece4eb1a92b5d7132783969e4bc31e4192db0 (diff)
Removing zlib mingw32 hack....
-rw-r--r--lib/Handle.cc4
-rw-r--r--lib/Makefile.sol.mingw2
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/Handle.cc b/lib/Handle.cc
index b894fe2..e3ed198 100644
--- a/lib/Handle.cc
+++ b/lib/Handle.cc
@@ -197,10 +197,6 @@ 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 3249192..d4685e5 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 -DIGNOREZDATAONCLOSE
+CPPFLAGS = -I../include -DFORCE64 -O3 -mwindows -D_REENTRANT -I/usr/local/win32/include -I../../extra/regex
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