Merge pull request #33376 from jamie-pate/master

Fix #24137 Different number of leading zeros on MINGW printf("%lg")

Merge pull request #33376 from jamie-pate/master
665ee70e · Rémi Verschelde · GitHub · 6952fc47 · bdb7adec · 665ee70e
Unverified Commit 665ee70e authored Nov 08, 2019 by Rémi Verschelde Committed by GitHub Nov 08, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

ustring.cpp core/ustring.cpp +10 -0

No files found.
--- a/core/ustring.cpp
+++ b/core/ustring.cpp
@@ -1337,7 +1337,17 @@ String String::num_scientific(double p_num) {
 	char buf[256];

 #if defined(__GNUC__) || defined(_MSC_VER)
+
+#if (defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1900)) && defined(_TWO_DIGIT_EXPONENT)
+	// MinGW and old MSC require _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)
+	_set_output_format(old_exponent_format);
+#endif
+
 #else
 	sprintf(buf, "%.16lg", p_num);
 #endif