diff options
| author | Gustavo Niemeyer <gustavo@niemeyer.net> | 2003-04-27 06:25:24 (GMT) |
|---|---|---|
| committer | Gustavo Niemeyer <gustavo@niemeyer.net> | 2003-04-27 06:25:24 (GMT) |
| commit | 7628f1ffff2ecaad085e5e68f438deafed15fa43 (patch) | |
| tree | 104753e7ae4dba7a83896cdee861f0e037aa2e82 /Modules/bz2module.c | |
| parent | 965697fc4bd3fc3dd5f18ff25dac3f1c7487e0ff (diff) | |
| download | cpython-7628f1ffff2ecaad085e5e68f438deafed15fa43.zip cpython-7628f1ffff2ecaad085e5e68f438deafed15fa43.tar.gz cpython-7628f1ffff2ecaad085e5e68f438deafed15fa43.tar.bz2 | |
Applying patch by Neal Norwitz:
[#727759] get bzip2 to build on Solaris 8 (old bzip library)
Diffstat (limited to 'Modules/bz2module.c')
| -rw-r--r-- | Modules/bz2module.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/Modules/bz2module.c b/Modules/bz2module.c index 5ab3f99..1fb6665 100644 --- a/Modules/bz2module.c +++ b/Modules/bz2module.c @@ -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) @@ -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) @@ -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, |