From d6947bcbed97889d7d56d400f81eb1691a3f18e1 Mon Sep 17 00:00:00 2001 From: jaanttil Date: Wed, 2 Nov 2011 09:21:19 +0200 Subject: Fixed compiler warning for libpng when compiling for WEC7. WEC7 mkspecs define _CRT_SECURE_NO_DEPRECATE globally. libpng redefined the same macro without checking if it is already defined. Added #ifdef guard for libpng '_CRT_SECURE_NO_DEPRECATE' macro definition. Task-number: QTBUG-22512 Change-Id: I41a7a0500b0f44984f35e4d7d6be9adb02c12b33 Reviewed-by: aavit --- src/3rdparty/libpng/pngpriv.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/3rdparty/libpng/pngpriv.h b/src/3rdparty/libpng/pngpriv.h index be4146d..1d144c4 100644 --- a/src/3rdparty/libpng/pngpriv.h +++ b/src/3rdparty/libpng/pngpriv.h @@ -26,7 +26,9 @@ #define PNGPRIV_H #ifdef _MSC_VER -# define _CRT_SECURE_NO_DEPRECATE +# ifndef _CRT_SECURE_NO_DEPRECATE +# define _CRT_SECURE_NO_DEPRECATE +# endif #endif /* Feature Test Macros. The following are defined here to ensure that correctly -- cgit v0.12