[Libreoffice-commits] .: package/source

[Caolán McNamara]

 package/source/zipapi/Deflater.cxx |    8 ++++----
 package/source/zipapi/Inflater.cxx |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 372a0d505c722fd8b39cf4f65487e7f08049896b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 15 16:02:47 2012 +0000

    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

diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx
index a6d7c45..5aab0c5 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 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);
diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx
index 87e7a4b..1bc9972 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 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);