Kaydet (Commit) 372a0d50 authored tarafından Caolán McNamara's avatar Caolán McNamara

these were surely meant to be Z_PREFIX not ZLIB_PREFIX

seeing as Z_PREFIX is what we set in our internal zlib
and one of these was ZLIB_PREFIXB anyway
üst 57e6f040
...@@ -93,7 +93,7 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence < sal_Int8 > &rBuffer, sal_Int ...@@ -93,7 +93,7 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence < sal_Int8 > &rBuffer, sal_Int
pStream->avail_in = nLength; pStream->avail_in = nLength;
pStream->avail_out = nNewLength; pStream->avail_out = nNewLength;
#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX #if defined SYSTEM_ZLIB || !defined Z_PREFIX
nResult = deflateParams(pStream, nLevel, nStrategy); nResult = deflateParams(pStream, nLevel, nStrategy);
#else #else
nResult = z_deflateParams(pStream, nLevel, nStrategy); nResult = z_deflateParams(pStream, nLevel, nStrategy);
...@@ -119,7 +119,7 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence < sal_Int8 > &rBuffer, sal_Int ...@@ -119,7 +119,7 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence < sal_Int8 > &rBuffer, sal_Int
pStream->avail_in = nLength; pStream->avail_in = nLength;
pStream->avail_out = nNewLength; 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); nResult = deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
#else #else
nResult = z_deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH); nResult = z_deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
...@@ -188,7 +188,7 @@ sal_Int32 SAL_CALL Deflater::getTotalOut( ) ...@@ -188,7 +188,7 @@ sal_Int32 SAL_CALL Deflater::getTotalOut( )
} }
void SAL_CALL Deflater::reset( ) void SAL_CALL Deflater::reset( )
{ {
#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIXB #if defined SYSTEM_ZLIB || !defined Z_PREFIX
deflateReset(pStream); deflateReset(pStream);
#else #else
z_deflateReset(pStream); z_deflateReset(pStream);
...@@ -201,7 +201,7 @@ void SAL_CALL Deflater::end( ) ...@@ -201,7 +201,7 @@ void SAL_CALL Deflater::end( )
{ {
if (pStream != NULL) if (pStream != NULL)
{ {
#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX #if defined SYSTEM_ZLIB || !defined Z_PREFIX
deflateEnd(pStream); deflateEnd(pStream);
#else #else
z_deflateEnd(pStream); z_deflateEnd(pStream);
......
...@@ -105,7 +105,7 @@ void SAL_CALL Inflater::end( ) ...@@ -105,7 +105,7 @@ void SAL_CALL Inflater::end( )
{ {
if (pStream != NULL) if (pStream != NULL)
{ {
#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX #if defined SYSTEM_ZLIB || !defined Z_PREFIX
inflateEnd(pStream); inflateEnd(pStream);
#else #else
z_inflateEnd(pStream); z_inflateEnd(pStream);
...@@ -130,7 +130,7 @@ sal_Int32 Inflater::doInflateBytes (Sequence < sal_Int8 > &rBuffer, sal_Int32 n ...@@ -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->next_out = reinterpret_cast < unsigned char* > ( rBuffer.getArray() + nNewOffset );
pStream->avail_out = nNewLength; 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); sal_Int32 nResult = ::inflate(pStream, Z_PARTIAL_FLUSH);
#else #else
sal_Int32 nResult = ::z_inflate(pStream, Z_PARTIAL_FLUSH); sal_Int32 nResult = ::z_inflate(pStream, Z_PARTIAL_FLUSH);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment