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-04-17 16:28:46 +0200 |
| commit | ec49bcb2e47f6bd514b0a39998815c2427ce33f2 (patch) | |
| tree | 9de3180e7beb93074d0f0520702c07d615726c27 /src | |
| parent | c7b52e2a2a46047b7b6bca74a39c81cf43f1c864 (diff) | |
Fixed MSVC compiler warning for zlib when compiling on WEC7.
WEC7 mkspecs define _CRT_SECURE_NO_DEPRECATE globally. zlib 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)
Diffstat (limited to 'src')
| -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 26b4d37c1d..9e4368e889 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 |