asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #52289 from Calinou/remove-old-msvc-support-ifdef

Browse source 
Remove `#ifdefs` for handling compilation with Visual Studio < 2015
This commit is contained in:
Max Hilbrunner 2021-09-07 21:01:44 +02:00 committed by GitHub
commit 9ada29e918
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/string/ustring.cpp
View file

@ -1653,13 +1653,13 @@ String String::num_scientific(double p_num) {
#if defined(__GNUC__) || defined(_MSC_VER) #if defined(__GNUC__) || defined(_MSC_VER)
#if (defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1900)) && defined(_TWO_DIGIT_EXPONENT) && !defined(_UCRT) #if defined(__MINGW32__) && defined(_TWO_DIGIT_EXPONENT) && !defined(_UCRT)
// MinGW and old MSC require _set_output_format() to conform to C99 output for printf // MinGW requires _set_output_format() to conform to C99 output for printf
unsigned int old_exponent_format = _set_output_format(_TWO_DIGIT_EXPONENT); unsigned int old_exponent_format = _set_output_format(_TWO_DIGIT_EXPONENT);
#endif #endif
snprintf(buf, 256, "%lg", p_num); snprintf(buf, 256, "%lg", p_num);
#if (defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1900)) && defined(_TWO_DIGIT_EXPONENT) && !defined(_UCRT) #if defined(__MINGW32__) && defined(_TWO_DIGIT_EXPONENT) && !defined(_UCRT)
_set_output_format(old_exponent_format); _set_output_format(old_exponent_format);
#endif #endif

2
modules/mono/utils/string_utils.cpp
View file

@ -200,7 +200,7 @@ String str_format(const char *p_format, ...) {
return res; return res;
} }
#if defined(MINGW_ENABLED) || defined(_MSC_VER) && _MSC_VER < 1900 #if defined(MINGW_ENABLED)
#define gd_vsnprintf(m_buffer, m_count, m_format, m_args_copy) vsnprintf_s(m_buffer, m_count, _TRUNCATE, m_format, m_args_copy) #define gd_vsnprintf(m_buffer, m_count, m_format, m_args_copy) vsnprintf_s(m_buffer, m_count, _TRUNCATE, m_format, m_args_copy)
#define gd_vscprintf(m_format, m_args_copy) _vscprintf(m_format, m_args_copy) #define gd_vscprintf(m_format, m_args_copy) _vscprintf(m_format, m_args_copy)
#else #else