diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-02-16 11:12:28 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-02-16 11:13:13 +0000 |
| commit | 39481744b199bed3a5f67f6ceee9c2e01595f2af (patch) | |
| tree | e1118e6e95547a33668d5b31d2a1d8346d125f64 /package | |
| parent | 1dd59441bd43071b11d2d952d625fb595083a793 (diff) | |
drop Z_PREFIX from internal zlib, makes building clucene much easier
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/zipapi/Deflater.cxx | 8 | ||||
| -rw-r--r-- | package/source/zipapi/Inflater.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx index 5aab0c58fc98..0b5a7fec7481 100644 --- a/package/source/zipapi/Deflater.cxx +++ b/package/source/zipapi/Deflater.cxx @@ -93,7 +93,7 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence < sal_Int8 > &rBuffer, sal_Int pStream->avail_in = nLength; pStream->avail_out = nNewLength; -#if defined SYSTEM_ZLIB || !defined Z_PREFIX +#if !defined Z_PREFIX nResult = deflateParams(pStream, nLevel, nStrategy); #else nResult = z_deflateParams(pStream, nLevel, nStrategy); @@ -119,7 +119,7 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence < sal_Int8 > &rBuffer, sal_Int pStream->avail_in = nLength; pStream->avail_out = nNewLength; -#if defined SYSTEM_ZLIB || !defined Z_PREFIX +#if !defined Z_PREFIX nResult = deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH); #else nResult = z_deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH); @@ -188,7 +188,7 @@ sal_Int32 SAL_CALL Deflater::getTotalOut( ) } void SAL_CALL Deflater::reset( ) { -#if defined SYSTEM_ZLIB || !defined Z_PREFIX +#if !defined Z_PREFIX deflateReset(pStream); #else z_deflateReset(pStream); @@ -201,7 +201,7 @@ void SAL_CALL Deflater::end( ) { if (pStream != NULL) { -#if defined SYSTEM_ZLIB || !defined Z_PREFIX +#if !defined Z_PREFIX deflateEnd(pStream); #else z_deflateEnd(pStream); diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx index 1bc997261c67..043c5011ddf7 100644 --- a/package/source/zipapi/Inflater.cxx +++ b/package/source/zipapi/Inflater.cxx @@ -105,7 +105,7 @@ void SAL_CALL Inflater::end( ) { if (pStream != NULL) { -#if defined SYSTEM_ZLIB || !defined Z_PREFIX +#if !defined Z_PREFIX inflateEnd(pStream); #else z_inflateEnd(pStream); @@ -130,7 +130,7 @@ sal_Int32 Inflater::doInflateBytes (Sequence < sal_Int8 > &rBuffer, sal_Int32 n pStream->next_out = reinterpret_cast < unsigned char* > ( rBuffer.getArray() + nNewOffset ); pStream->avail_out = nNewLength; -#if defined SYSTEM_ZLIB || !defined Z_PREFIX +#if !defined Z_PREFIX sal_Int32 nResult = ::inflate(pStream, Z_PARTIAL_FLUSH); #else sal_Int32 nResult = ::z_inflate(pStream, Z_PARTIAL_FLUSH); |