From 8f7a6217e99f0e4b6becfb6f0763e3dd7290ba23 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Wed, 2 Nov 2011 09:24:10 +0200 Subject: 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 (cherry picked from commit a0a970447d63e5c9afdb55d179d671d9c24e9061) --- src/3rdparty/zlib/gzguts.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src') 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 -- cgit v1.2.1