diff options
| author | Frederik Gladhorn <[email protected]> | 2016-01-08 12:30:57 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <[email protected]> | 2016-01-08 12:35:24 +0100 |
| commit | ad16478a76815f8f61d454bf7760aaf9ffbb4b51 (patch) | |
| tree | eefdd9219cc9d59b62e042f49fc7555b980cb7a4 /src/3rdparty/zlib/zlib.h | |
| parent | 80a741f3616290897ba0d9f1cbd3c9c5ee62da37 (diff) | |
| parent | 09c92863001790a0304a5ef389901ee2b5b6cdc2 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Based on merge done by Liang Qi
Change-Id: Id566e5b9f284d29bff2199f13f9417c660f5b26f
Diffstat (limited to 'src/3rdparty/zlib/zlib.h')
| -rw-r--r-- | src/3rdparty/zlib/zlib.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/3rdparty/zlib/zlib.h b/src/3rdparty/zlib/zlib.h index 5229707f526..d0908ab6e9d 100644 --- a/src/3rdparty/zlib/zlib.h +++ b/src/3rdparty/zlib/zlib.h @@ -34,13 +34,8 @@ #include "zconf.h" #include <qglobal.h> -#if defined(QT_VISIBILITY_AVAILABLE) -# undef ZEXTERN -# define ZEXTERN __attribute__((visibility("default"))) -#else -# undef ZEXTERN -# define ZEXTERN Q_DECL_EXPORT -#endif +#undef ZEXTERN +#define ZEXTERN Q_CORE_EXPORT #ifdef __cplusplus extern "C" { |