diff options
| author | jaanttil <janne.anttila@digia.com> | 2011-11-02 07:21:19 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-01 12:47:59 (GMT) |
| commit | d6947bcbed97889d7d56d400f81eb1691a3f18e1 (patch) | |
| tree | beaf0d7c529bba5218d4bf86467aaa9035825e89 /src | |
| parent | 0e97dc311b812aeea5fda5dcaf6d43f0807d548d (diff) | |
| download | Qt-d6947bcbed97889d7d56d400f81eb1691a3f18e1.zip Qt-d6947bcbed97889d7d56d400f81eb1691a3f18e1.tar.gz Qt-d6947bcbed97889d7d56d400f81eb1691a3f18e1.tar.bz2 | |
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 <qt_aavit@ovi.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/libpng/pngpriv.h | 4 |
1 files changed, 3 insertions, 1 deletions
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 |