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

[Fridrich Strba]

 zlib/zlib-1.2.5.patch |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

New commits:
commit 7e7640beb9ceea90467cf4028f926e4358957800
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Aug 12 09:49:15 2011 +0200

    Prefix internal zlib symbols by z_
    
    Historically the internal zlib symbols were prefixed by z_ to not mess up with any system zlib symbols.
    Keep this good habit even with zlib-1.2.5.

diff --git a/zlib/zlib-1.2.5.patch b/zlib/zlib-1.2.5.patch
index 7021a2c..41ae0d4 100644
--- a/zlib/zlib-1.2.5.patch
+++ b/zlib/zlib-1.2.5.patch
@@ -69,3 +69,18 @@
 +.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 */