6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-21 06:30:16 +00:00
Code Issues Projects Releases Wiki Activity

Allow this to compile even on machines that HAVE the bzlib library but do

Browse Source 
NOT have the bzlib.h header file. Go figure.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17989 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2004-11-19 15:56:28 +00:00
parent a98c5453b2
commit ebf2bda8cd
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Support/Compressor.cpp
View File

@ -19,11 +19,17 @@
#include <string> #include <string>
#ifdef HAVE_BZIP2 #ifdef HAVE_BZIP2
#ifdef HAVE_BZLIB_H
#include <bzlib.h> #include <bzlib.h>
#endif #define BZIP2_GOOD
#endif
#endif
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
#ifdef HAVE_ZLIB_H
#include <zlib.h> #include <zlib.h>
#define ZLIB_GOOD
#endif
#endif #endif
namespace { namespace {
@ -250,7 +256,7 @@ uint64_t Compressor::compress(const char* in, unsigned size,
switch (hint) { switch (hint) {
case COMP_TYPE_BZIP2: { case COMP_TYPE_BZIP2: {
#if defined(HAVE_BZIP2) #if defined(BZIP2_GOOD)
// Set up the bz_stream // Set up the bz_stream
bz_stream bzdata; bz_stream bzdata;
bzdata.bzalloc = 0; bzdata.bzalloc = 0;
@ -307,7 +313,7 @@ uint64_t Compressor::compress(const char* in, unsigned size,
} }
case COMP_TYPE_ZLIB: { case COMP_TYPE_ZLIB: {
#if defined(HAVE_ZLIB) #if defined(ZLIB_GOOD)
z_stream zdata; z_stream zdata;
zdata.zalloc = Z_NULL; zdata.zalloc = Z_NULL;
zdata.zfree = Z_NULL; zdata.zfree = Z_NULL;
@ -414,7 +420,7 @@ uint64_t Compressor::decompress(const char *in, unsigned size,
switch (*in++) { switch (*in++) {
case COMP_TYPE_BZIP2: { case COMP_TYPE_BZIP2: {
#if !defined(HAVE_BZIP2) #if !defined(BZIP2_GOOD)
throw std::string("Can't decompress BZIP2 data"); throw std::string("Can't decompress BZIP2 data");
#else #else
// Set up the bz_stream // Set up the bz_stream
@ -469,7 +475,7 @@ uint64_t Compressor::decompress(const char *in, unsigned size,
} }
case COMP_TYPE_ZLIB: { case COMP_TYPE_ZLIB: {
#if !defined(HAVE_ZLIB) #if !defined(ZLIB_GOOD)
throw std::string("Can't decompress ZLIB data"); throw std::string("Can't decompress ZLIB data");
#else #else
z_stream zdata; z_stream zdata;