diff options
| author | Ignacio Roldán Etcheverry <neikeq@users.noreply.github.com> | 2019-05-05 16:47:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-05 16:47:21 +0200 |
| commit | 255ea11502dd91a91d98e6d1bd054ceaf3aee619 (patch) | |
| tree | 984fec84b56a6b8eec48160e1abb8b812d016efd /modules/mono/utils/string_utils.cpp | |
| parent | 5128430700f3f9751e422ce7fd9fcc4f5eeae553 (diff) | |
| parent | 77ab9ba252b608af04b5ce89685a9af250792f32 (diff) | |
Merge pull request #28700 from ShyRed/fixmonogluewindows
Fix generation of Mono Glue for Visual Studio 2017+
Diffstat (limited to 'modules/mono/utils/string_utils.cpp')
| -rw-r--r-- | modules/mono/utils/string_utils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/mono/utils/string_utils.cpp b/modules/mono/utils/string_utils.cpp index 0a7470f866..877122985d 100644 --- a/modules/mono/utils/string_utils.cpp +++ b/modules/mono/utils/string_utils.cpp @@ -210,7 +210,7 @@ String str_format(const char *p_format, ...) { #endif #endif -#if defined(MINGW_ENABLED) || defined(_MSC_VER) +#if defined(MINGW_ENABLED) || defined(_MSC_VER) && _MSC_VER < 1900 #define vsnprintf(m_buffer, m_count, m_format, m_argptr) vsnprintf_s(m_buffer, m_count, _TRUNCATE, m_format, m_argptr) #endif |