Merge branch 'dev-5.3' into mixed

This commit is contained in:
Gabor Kiss-Vamosi
2019-01-23 14:44:18 +01:00
7 changed files with 144 additions and 28 deletions

View File

@@ -371,7 +371,7 @@
/*************************
* Non-user section
*************************/
#ifdef _MSC_VER /* Disable warnings for Visual Studio*/
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS) /* Disable warnings for Visual Studio*/
#define _CRT_SECURE_NO_WARNINGS
#endif