[Libreoffice-commits] .: package/source zlib/zlib-1.2.5.patch

[Caolán McNamara]

 package/source/zipapi/Deflater.cxx |    8 ++++----
 package/source/zipapi/Inflater.cxx |    4 ++--
 zlib/zlib-1.2.5.patch              |   15 ---------------
 3 files changed, 6 insertions(+), 21 deletions(-)

New commits:
commit 39481744b199bed3a5f67f6ceee9c2e01595f2af
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 16 11:12:28 2012 +0000

    drop Z_PREFIX from internal zlib, makes building clucene much easier

diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx
index 5aab0c5..0b5a7fe 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 1bc9972..043c501 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);
diff --git a/zlib/zlib-1.2.5.patch b/zlib/zlib-1.2.5.patch
index 41ae0d4..7021a2c 100644
--- a/zlib/zlib-1.2.5.patch
+++ b/zlib/zlib-1.2.5.patch
@@ -69,18 +69,3 @@
 +.INCLUDE :  target.mk
 +.INCLUDE :  tg_wntx64.mk
 +
---- misc/zlib-1.2.5/zconf.h	2010-04-18 19:58:06.000000000 +0200
-+++ misc/build/zlib-1.2.5/zconf.h	2011-08-12 09:44:59.524936228 +0200
-@@ -14,6 +14,12 @@
-  * Even better than compiling with -DZ_PREFIX would be to use configure to set
-  * this permanently in zconf.h using "./configure --zprefix".
-  */
-+/*
-+ * we need the prefix to get the same names as in 1.1.3
-+*/
-+
-+#define Z_PREFIX
-+
- #ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
- 
- /* all linked symbols */