diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2021-09-07 21:01:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-07 21:01:44 +0200 |
| commit | 9ada29e918625c27248c301f1d45f93e7b871b72 (patch) | |
| tree | faae6c4c7af8330460807d258863888509a14f76 | |
| parent | 99ffbbfc44190a8f726652a1b6ed83b5a213e3e3 (diff) | |
| parent | fc0bfbb33b671ea03168d6cb39b83e0a3fb13c53 (diff) | |
Merge pull request #52289 from Calinou/remove-old-msvc-support-ifdef
Remove `#ifdefs` for handling compilation with Visual Studio < 2015
| -rw-r--r-- | core/string/ustring.cpp | 6 | ||||
| -rw-r--r-- | modules/mono/utils/string_utils.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/string/ustring.cpp b/core/string/ustring.cpp index a3b5356b1d..ed6fd13cc8 100644 --- a/core/string/ustring.cpp +++ b/core/string/ustring.cpp @@ -1653,13 +1653,13 @@ String String::num_scientific(double p_num) { #if defined(__GNUC__) || defined(_MSC_VER) -#if (defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1900)) && defined(_TWO_DIGIT_EXPONENT) && !defined(_UCRT) - // MinGW and old MSC require _set_output_format() to conform to C99 output for printf +#if defined(__MINGW32__) && defined(_TWO_DIGIT_EXPONENT) && !defined(_UCRT) + // MinGW requires _set_output_format() to conform to C99 output for printf unsigned int old_exponent_format = _set_output_format(_TWO_DIGIT_EXPONENT); #endif 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); #endif diff --git a/modules/mono/utils/string_utils.cpp b/modules/mono/utils/string_utils.cpp index 053618ebe4..2fb5e446da 100644 --- a/modules/mono/utils/string_utils.cpp +++ b/modules/mono/utils/string_utils.cpp @@ -200,7 +200,7 @@ String str_format(const char *p_format, ...) { 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_vscprintf(m_format, m_args_copy) _vscprintf(m_format, m_args_copy) #else |