summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2011-04-04 12:43:28 (GMT)
committeraavit <qt-info@nokia.com>2011-04-04 12:43:28 (GMT)
commit07df7ee20a0f3027516ad03465a2fb7b7e38e864 (patch)
tree7e366179ef6bddf3fa4687e0d33f3a89c871f09f
parent3cdbe0c7bc42f5f3bcb8c2f6d93cbb4d20c720e2 (diff)
downloadQt-07df7ee20a0f3027516ad03465a2fb7b7e38e864.zip
Qt-07df7ee20a0f3027516ad03465a2fb7b7e38e864.tar.gz
Qt-07df7ee20a0f3027516ad03465a2fb7b7e38e864.tar.bz2
Avoid some compiler warnings on Windows
-rw-r--r--src/3rdparty/zlib/zconf.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/zlib/zconf.h b/src/3rdparty/zlib/zconf.h
index 0105ca4..a92eb36 100644
--- a/src/3rdparty/zlib/zconf.h
+++ b/src/3rdparty/zlib/zconf.h
@@ -271,6 +271,8 @@
#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.
*/