diff options
| author | Tim Blechmann <[email protected]> | 2014-01-06 14:04:32 +0100 |
|---|---|---|
| committer | The Qt Project <[email protected]> | 2014-01-09 20:14:48 +0100 |
| commit | c8a8e0fb18c7c7cb6cf445dc9595eaf69f3cd126 (patch) | |
| tree | 33724dddd30783c21d12951526b40920329b5b34 | |
| parent | d76f05e955205c3764dd184a8583ed785fc51b33 (diff) | |
zlib: rename z_errmsg symbol to avoid name clash when linking statically
Task-number: QTBUG-35301
Change-Id: I298fba7270ee49d4e2dfc624b18aa13ce25864be
Reviewed-by: Konstantin Ritt <[email protected]>
Reviewed-by: aavit <[email protected]>
Reviewed-by: Oswald Buddenhagen <[email protected]>
| -rw-r--r-- | src/3rdparty/zlib/zconf.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/zlib/zconf.h b/src/3rdparty/zlib/zconf.h index dc52489bc21..d01f20bc070 100644 --- a/src/3rdparty/zlib/zconf.h +++ b/src/3rdparty/zlib/zconf.h @@ -107,6 +107,7 @@ # define zcfree z_zcfree # define zlibCompileFlags z_zlibCompileFlags # define zlibVersion z_zlibVersion +# define z_errmsg z_z_errmsg /* all zlib typedefs in zlib.h and zconf.h */ # define Byte z_Byte |