From dbe2f388e960ca9d3c6ebbb68fbe57771a205700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=B6r=C3=B6k=20Edvin?= <edwin@clamav.net>
Date: Sat, 29 Dec 2007 14:37:54 +0000
Subject: [PATCH] the ugly hack isn't needed on Solaris after all, if building
 with system zlib. Instead defining only Z_BLOCK is enough.

git-svn: trunk@3467
---
 ChangeLog                  | 5 +++++
 libclamav/dconf.h          | 5 -----
 libclamav/inflate64_priv.h | 4 ++++
 libclamav/lzma_iface.h     | 3 ---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 30a7d11b9..a7d66866f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 29 16:02:47 EET 2007 (edwin)
+------------------------------------
+  * libclamav: the ugly hack isn't needed on Solaris after all, if building
+  with system zlib. Instead defining only Z_BLOCK is enough.
+
 Sat Dec 29 14:41:29 CET 2007 (acab)
 -----------------------------------
   * libclamav:	Misc fixes to make gcc 3.4.6 work on solaris
diff --git a/libclamav/dconf.h b/libclamav/dconf.h
index 120e2ba89..d5b4f651b 100644
--- a/libclamav/dconf.h
+++ b/libclamav/dconf.h
@@ -19,11 +19,6 @@
 #ifndef __DCONF_H
 #define __DCONF_H
 
-/* DIRTY HACK TO COMPILE ON SOLARIS GCC 3.4.6 */
-#ifdef Byte
-#undef Byte
-#endif
-/* DIRTY HACK TO COMPILE ON SOLARIS GCC 3.4.6 */
 
 #include <stdio.h>
 #include <zlib.h>
diff --git a/libclamav/inflate64_priv.h b/libclamav/inflate64_priv.h
index 73dd97cf0..95c90e4c5 100644
--- a/libclamav/inflate64_priv.h
+++ b/libclamav/inflate64_priv.h
@@ -48,6 +48,10 @@
 
 #include <zlib.h> /* adler/crc32 */
 
+#ifndef Z_BLOCK
+#define Z_BLOCK 5
+#endif
+
 #ifndef local
 #  define local static
 #endif
diff --git a/libclamav/lzma_iface.h b/libclamav/lzma_iface.h
index ed5ea392a..c5d944390 100644
--- a/libclamav/lzma_iface.h
+++ b/libclamav/lzma_iface.h
@@ -22,9 +22,6 @@
 #ifndef __LZMA_IFACE_H
 #define __LZMA_IFACE_H
 
-/* DIRTY HACK TO COMPILE ON SOLARIS GCC 3.4.6 */
-#define Byte BByte
-/* DIRTY HACK TO COMPILE ON SOLARIS GCC 3.4.6 */
 
 #include "LzmaStateDecode.h"
 #include "cltypes.h"