summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/zlib
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2011-03-24 12:13:32 (GMT)
committeraavit <qt-info@nokia.com>2011-03-24 12:13:32 (GMT)
commitf8a7c51bafe987dbc3ec0b4b53319c97823e1ba1 (patch)
tree67df6ae88af1654681754594e5902a1a41eb6733 /src/3rdparty/zlib
parent424b2ed0ab3f683291ff99933c36397d9be49a4d (diff)
downloadQt-f8a7c51bafe987dbc3ec0b4b53319c97823e1ba1.zip
Qt-f8a7c51bafe987dbc3ec0b4b53319c97823e1ba1.tar.gz
Qt-f8a7c51bafe987dbc3ec0b4b53319c97823e1ba1.tar.bz2
Upgrading zlib: Patches to build internal zlib in Qt
Diffstat (limited to 'src/3rdparty/zlib')
-rw-r--r--src/3rdparty/zlib/zlib.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/3rdparty/zlib/zlib.h b/src/3rdparty/zlib/zlib.h
index bfbba83..4069724 100644
--- a/src/3rdparty/zlib/zlib.h
+++ b/src/3rdparty/zlib/zlib.h
@@ -33,6 +33,15 @@
#include "zconf.h"
+#include "qconfig.h"
+#if defined(QT_VISIBILITY_AVAILABLE)
+# undef ZEXTERN
+# define ZEXTERN __attribute__((visibility("default")))
+#elif defined(QT_MAKEDLL)
+# undef ZEXTERN
+# define ZEXTERN __declspec(dllexport)
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif