mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

these were surely meant to be Z_PREFIX not ZLIB_PREFIX

Browse Source 
seeing as Z_PREFIX is what we set in our internal zlib
and one of these was ZLIB_PREFIXB anyway
This commit is contained in:
Caolán McNamara
2012-02-15 16:02:47 +00:00
parent 57e6f04066
commit 372a0d505c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package/source/zipapi/Deflater.cxx
View File

@@ -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 ZLIB_PREFIX
#if defined SYSTEM_ZLIB || !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 ZLIB_PREFIX
#if defined SYSTEM_ZLIB || !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 ZLIB_PREFIXB
#if defined SYSTEM_ZLIB || !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 ZLIB_PREFIX
#if defined SYSTEM_ZLIB || !defined Z_PREFIX
deflateEnd(pStream);
#else
z_deflateEnd(pStream);

4
package/source/zipapi/Inflater.cxx
View File

@@ -105,7 +105,7 @@ void SAL_CALL Inflater::end( )
{
if (pStream != NULL)
{
#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
#if defined SYSTEM_ZLIB || !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 ZLIB_PREFIX
#if defined SYSTEM_ZLIB || !defined Z_PREFIX
sal_Int32 nResult = ::inflate(pStream, Z_PARTIAL_FLUSH);
#else
sal_Int32 nResult = ::z_inflate(pStream, Z_PARTIAL_FLUSH);