Skip to content

Commit

Permalink
Applying patch by Neal Norwitz:
Browse files Browse the repository at this point in the history
   [#727759] get bzip2 to build on Solaris 8 (old bzip library)
  • Loading branch information
niemeyer committed Apr 27, 2003
1 parent 965697f commit 7628f1f
Showing 1 changed file with 25 additions and 0 deletions.
25 changes: 25 additions & 0 deletions Modules/bz2module.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ static char __author__[] =

#define BZ2FileObject_Check(v) ((v)->ob_type == &BZ2File_Type)


#ifdef BZ_CONFIG_ERROR

#if SIZEOF_LONG >= 8
#define BZS_TOTAL_OUT(bzs) \
(((long)bzs->total_out_hi32 << 32) + bzs->total_out_lo32)
Expand All @@ -42,6 +45,26 @@ static char __author__[] =
bzs->total_out_lo32;
#endif

#else /* ! BZ_CONFIG_ERROR */

#define BZ2_bzRead bzRead
#define BZ2_bzReadOpen bzReadOpen
#define BZ2_bzReadClose bzReadClose
#define BZ2_bzWrite bzWrite
#define BZ2_bzWriteOpen bzWriteOpen
#define BZ2_bzWriteClose bzWriteClose
#define BZ2_bzCompress bzCompress
#define BZ2_bzCompressInit bzCompressInit
#define BZ2_bzCompressEnd bzCompressEnd
#define BZ2_bzDecompress bzDecompress
#define BZ2_bzDecompressInit bzDecompressInit
#define BZ2_bzDecompressEnd bzDecompressEnd

#define BZS_TOTAL_OUT(bzs) bzs->total_out

#endif /* ! BZ_CONFIG_ERROR */


#ifdef WITH_THREAD
#define ACQUIRE_LOCK(obj) PyThread_acquire_lock(obj->lock, 1)
#define RELEASE_LOCK(obj) PyThread_release_lock(obj->lock)
Expand Down Expand Up @@ -117,12 +140,14 @@ Util_CatchBZ2Error(int bzerror)
case BZ_STREAM_END:
break;

#ifdef BZ_CONFIG_ERROR
case BZ_CONFIG_ERROR:
PyErr_SetString(PyExc_SystemError,
"the bz2 library was not compiled "
"correctly");
ret = 1;
break;
#endif

case BZ_PARAM_ERROR:
PyErr_SetString(PyExc_ValueError,
Expand Down

0 comments on commit 7628f1f

Please sign in to comment.