diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2011-11-02 09:24:10 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-05 14:34:06 +0200 |
| commit | 8f7a6217e99f0e4b6becfb6f0763e3dd7290ba23 (patch) | |
| tree | 0a1e31ecfb2c377b90b23806c72ecadbc35b8c87 | |
| parent | 0d129f9b85503f23cc270f9cf7b310f44dd11ebe (diff) | |
| download | qtsvg-8f7a6217e99f0e4b6becfb6f0763e3dd7290ba23.tar.gz | |
Fixed MSVC compiler warning for zlib when compiling on WEC7.
WEC7 mkspecs define _CRT_SECURE_NO_DEPRECATE globally. libpng redefined
the same macro without checking if it is already defined. Added #ifdef
guard to zlib when defining _CRT_SECURE_NO_DEPRECATE.
Task-number: QTBUG-22512
Change-Id: I477b24b7bc0ebb4cd8a619b11668eceb0f5064d4
Reviewed-by: aavit <qt_aavit@ovi.com>
(cherry picked from commit a0a970447d63e5c9afdb55d179d671d9c24e9061)
| -rw-r--r-- | src/3rdparty/zlib/gzguts.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/3rdparty/zlib/gzguts.h b/src/3rdparty/zlib/gzguts.h index c752b57..9f9640b 100644 --- a/src/3rdparty/zlib/gzguts.h +++ b/src/3rdparty/zlib/gzguts.h @@ -4,8 +4,12 @@ */ #ifdef _MSC_VER -# define _CRT_SECURE_NO_DEPRECATE -# define _CRT_NONSTDC_NO_DEPRECATE +# ifndef _CRT_SECURE_NO_DEPRECATE +# define _CRT_SECURE_NO_DEPRECATE +# endif +# ifndef _CRT_NONSTDC_NO_DEPRECATE +# define _CRT_NONSTDC_NO_DEPRECATE +# endif #endif #ifdef _LARGEFILE64_SOURCE |