diff options
| author | aavit <qt-info@nokia.com> | 2011-04-06 10:19:18 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-04-06 10:29:10 (GMT) |
| commit | 892897a2d81f9a38944054329a0236748264efc9 (patch) | |
| tree | fbe1b3501229bccf898d03859d2ceaf0ca600af4 /src/3rdparty | |
| parent | abb62219db97cc77da16a9b12aa833bdcf8ae476 (diff) | |
| download | Qt-892897a2d81f9a38944054329a0236748264efc9.zip Qt-892897a2d81f9a38944054329a0236748264efc9.tar.gz Qt-892897a2d81f9a38944054329a0236748264efc9.tar.bz2 | |
Avoid compilation warnings on Symbian
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/zlib/gzguts.h | 3 | ||||
| -rw-r--r-- | src/3rdparty/zlib/zconf.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/zlib/zutil.h | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/3rdparty/zlib/gzguts.h b/src/3rdparty/zlib/gzguts.h index 347af46..c752b57 100644 --- a/src/3rdparty/zlib/gzguts.h +++ b/src/3rdparty/zlib/gzguts.h @@ -17,7 +17,8 @@ # endif #endif -#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ) +#include "qconfig.h" +#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ) && defined(QT_VISIBILITY_AVAILABLE) # define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) #else # define ZLIB_INTERNAL diff --git a/src/3rdparty/zlib/zconf.h b/src/3rdparty/zlib/zconf.h index 0105ca4..806a51e 100644 --- a/src/3rdparty/zlib/zconf.h +++ b/src/3rdparty/zlib/zconf.h @@ -356,7 +356,7 @@ typedef uLong FAR uLongf; typedef Byte *voidp; #endif -#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ +#if defined(HAVE_UNISTD_H) || !defined(WIN32) # define Z_HAVE_UNISTD_H #endif diff --git a/src/3rdparty/zlib/zutil.h b/src/3rdparty/zlib/zutil.h index 258fa88..8e535ac 100644 --- a/src/3rdparty/zlib/zutil.h +++ b/src/3rdparty/zlib/zutil.h @@ -13,7 +13,8 @@ #ifndef ZUTIL_H #define ZUTIL_H -#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ) +#include "qconfig.h" +#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ) && defined(QT_VISIBILITY_AVAILABLE) # define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) #else # define ZLIB_INTERNAL |