Merge branch 'develop'

Author: Flamefire

.appveyor.yml

@@ -99,11 +99,11 @@ environment:
       B2_CXXSTD: 03,11,14,1z
       B2_TOOLSET: gcc
 
-    - FLAVOR: mingw32
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    - FLAVOR: mingw64 (32-bit)
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      ADDPATH: C:\mingw-w64\i686-8.1.0-posix-dwarf-rt_v6-rev0\mingw32\bin;
       B2_ADDRESS_MODEL: 32
-      ADDPATH: C:\mingw\bin;
-      B2_CXXSTD: 03,11,14,1z
+      B2_CXXSTD: 03,11,14,17,2a
       B2_TOOLSET: gcc
 
     - FLAVOR: mingw64

src/cstdio.cpp

@@ -8,7 +8,9 @@
 #define BOOST_NOWIDE_SOURCE
 
 #ifdef _MSC_VER
+#ifndef _CRT_SECURE_NO_WARNINGS
 #define _CRT_SECURE_NO_WARNINGS
+#endif
 #elif defined(__MINGW32__) && defined(__STRICT_ANSI__)
 // Need the _w* functions which are extensions on MinGW but not on MinGW-w64
 #include <_mingw.h>

src/cstdlib.cpp

@@ -8,7 +8,9 @@
 #define BOOST_NOWIDE_SOURCE
 
 #ifdef _MSC_VER
+#ifndef _CRT_SECURE_NO_WARNINGS
 #define _CRT_SECURE_NO_WARNINGS
+#endif
 #elif defined(__MINGW32__) && defined(__STRICT_ANSI__)
 // Need the _w* functions which are extensions on MinGW but not on MinGW-w64
 #include <_mingw.h>

test/test_system.cpp

@@ -5,8 +5,10 @@
 // https://www.boost.org/LICENSE_1_0.txt
 
 #ifdef _MSC_VER
+#ifndef _CRT_SECURE_NO_WARNINGS
 #define _CRT_SECURE_NO_WARNINGS
 #endif
+#endif
 
 #include <boost/nowide/args.hpp>
 #include <boost/nowide/cstdlib.hpp>