diff options
| author | jaanttil <janne.anttila@digia.com> | 2011-10-31 14:02:32 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-01 12:48:37 (GMT) |
| commit | 1a1a8f004824b981865c6239747ff05d8e6f812a (patch) | |
| tree | a2bd0ce0549607eec43c1b584aa479d68ad72b6b | |
| parent | a0a970447d63e5c9afdb55d179d671d9c24e9061 (diff) | |
| download | Qt-1a1a8f004824b981865c6239747ff05d8e6f812a.zip Qt-1a1a8f004824b981865c6239747ff05d8e6f812a.tar.gz Qt-1a1a8f004824b981865c6239747ff05d8e6f812a.tar.bz2 | |
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 <qt_aavit@ovi.com>
| -rw-r--r-- | src/3rdparty/libjpeg/jinclude.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/libjpeg/jinclude.h b/src/3rdparty/libjpeg/jinclude.h index a61939d..464b84d 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 |