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
This commit is contained in:
Török Edvin
2007-12-29 14:37:54 +00:00
parent 9f0d9b9890
commit dbe2f388e9
4 changed files with 9 additions and 8 deletions

View File

@@ -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

View File

@@ -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>

View File

@@ -48,6 +48,10 @@
#include <zlib.h> /* adler/crc32 */
#ifndef Z_BLOCK
#define Z_BLOCK 5
#endif
#ifndef local
# define local static
#endif

View File

@@ -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"