Merge pull request #2433 from kaleb-himes/ZD_5602_MINGW_XSNPRINTF

Resolve XSNPRINTF unconditional use in asn.c breaking mingw32 builds
This commit is contained in:
David Garske
2019-09-05 11:37:21 -07:00
committed by GitHub

View File

@@ -440,8 +440,8 @@
#define XSNPRINTF snprintf #define XSNPRINTF snprintf
#endif #endif
#else #else
#ifdef _MSC_VER #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
#if (_MSC_VER >= 1900) #if defined(_MSC_VER) && (_MSC_VER >= 1900)
/* Beginning with the UCRT in Visual Studio 2015 and /* Beginning with the UCRT in Visual Studio 2015 and
Windows 10, snprintf is no longer identical to Windows 10, snprintf is no longer identical to
_snprintf. The snprintf function behavior is now _snprintf. The snprintf function behavior is now
@@ -467,7 +467,7 @@
} }
#define XSNPRINTF xsnprintf #define XSNPRINTF xsnprintf
#endif /* (_MSC_VER >= 1900) */ #endif /* (_MSC_VER >= 1900) */
#endif /* _MSC_VER */ #endif /* _MSC_VER || __CYGWIN__ || __MINGW32__ */
#endif /* USE_WINDOWS_API */ #endif /* USE_WINDOWS_API */
#if defined(WOLFSSL_CERT_EXT) || defined(HAVE_ALPN) #if defined(WOLFSSL_CERT_EXT) || defined(HAVE_ALPN)