diff options
| author | aavit <qt-info@nokia.com> | 2011-04-05 09:25:59 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-04-05 09:25:59 (GMT) |
| commit | 0e12c56a972320a608bbb8c31b7726674f000bb1 (patch) | |
| tree | f2b53516309dbfbf4df8c6374769fccdaf8ebe1d /src/3rdparty | |
| parent | 2f59eaeee1fbe33d07b0e7d0747afd8658df95ac (diff) | |
| download | Qt-0e12c56a972320a608bbb8c31b7726674f000bb1.zip Qt-0e12c56a972320a608bbb8c31b7726674f000bb1.tar.gz Qt-0e12c56a972320a608bbb8c31b7726674f000bb1.tar.bz2 | |
Really avoid compiler warnings on Windows
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/libjpeg/jinclude.h | 4 | ||||
| -rw-r--r-- | src/3rdparty/libpng/pngpriv.h | 4 | ||||
| -rw-r--r-- | src/3rdparty/zlib/gzguts.h | 5 | ||||
| -rw-r--r-- | src/3rdparty/zlib/zconf.h | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/src/3rdparty/libjpeg/jinclude.h b/src/3rdparty/libjpeg/jinclude.h index 0a4f151..a61939d 100644 --- a/src/3rdparty/libjpeg/jinclude.h +++ b/src/3rdparty/libjpeg/jinclude.h @@ -20,6 +20,10 @@ #include "jconfig.h" /* auto configuration options */ #define JCONFIG_INCLUDED /* so that jpeglib.h doesn't do it again */ +#ifdef _MSC_VER +# define _CRT_SECURE_NO_DEPRECATE +#endif + /* * We need the NULL macro and size_t typedef. * On an ANSI-conforming system it is sufficient to include <stddef.h>. diff --git a/src/3rdparty/libpng/pngpriv.h b/src/3rdparty/libpng/pngpriv.h index 45a622b..9b90f26 100644 --- a/src/3rdparty/libpng/pngpriv.h +++ b/src/3rdparty/libpng/pngpriv.h @@ -25,6 +25,10 @@ #ifndef PNGPRIV_H #define PNGPRIV_H +#ifdef _MSC_VER +# define _CRT_SECURE_NO_DEPRECATE +#endif + /* This is required for the definition of abort(), used as a last ditch * error handler when all else fails. */ diff --git a/src/3rdparty/zlib/gzguts.h b/src/3rdparty/zlib/gzguts.h index 60b493e..347af46 100644 --- a/src/3rdparty/zlib/gzguts.h +++ b/src/3rdparty/zlib/gzguts.h @@ -3,6 +3,11 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ +#ifdef _MSC_VER +# define _CRT_SECURE_NO_DEPRECATE +# define _CRT_NONSTDC_NO_DEPRECATE +#endif + #ifdef _LARGEFILE64_SOURCE # ifndef _LARGEFILE_SOURCE # define _LARGEFILE_SOURCE 1 diff --git a/src/3rdparty/zlib/zconf.h b/src/3rdparty/zlib/zconf.h index a92eb36..0105ca4 100644 --- a/src/3rdparty/zlib/zconf.h +++ b/src/3rdparty/zlib/zconf.h @@ -271,8 +271,6 @@ #endif #if defined(WINDOWS) || defined(WIN32) -# define _CRT_SECURE_NO_DEPRECATE -# define _CRT_NONSTDC_NO_DEPRECATE /* If building or using zlib as a DLL, define ZLIB_DLL. * This is not mandatory, but it offers a little performance increase. */ |