From 7bab41a68116fe70b5f2ddb5d03f6fa0db25a01a Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Mon, 31 Oct 2011 16:02:32 +0200 Subject: Fixed libjpeg compiler warning about macro redefinition. When compiling Qt for Windows CE the MSVC reported the followin warning: warning C4005: '_CRT_SECURE_NO_DEPRECATE' : macro redefinition Fixed by adding ifdef quard for duplicate _CRT_SECURE_NO_DEPRECATE. Task-number: QTBUG-22512 Change-Id: I8c37ffe6ca275c80a7b7e6b23f39f3ab06b332f1 Reviewed-by: aavit (cherry picked from commit 1a1a8f004824b981865c6239747ff05d8e6f812a) --- src/3rdparty/libjpeg/jinclude.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/3rdparty') diff --git a/src/3rdparty/libjpeg/jinclude.h b/src/3rdparty/libjpeg/jinclude.h index a61939daaa..464b84d6d3 100644 --- a/src/3rdparty/libjpeg/jinclude.h +++ b/src/3rdparty/libjpeg/jinclude.h @@ -20,7 +20,7 @@ #include "jconfig.h" /* auto configuration options */ #define JCONFIG_INCLUDED /* so that jpeglib.h doesn't do it again */ -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined (_CRT_SECURE_NO_DEPRECATE) # define _CRT_SECURE_NO_DEPRECATE #endif -- cgit v1.2.3