Merge e6867f54b978ff992f4855ce7026a21c0f1a78b4 into f8c573d7419ab08de382c60005e37caa271e869a

Merge pull request #338 from Gravecat/mingw-fix
Fixes compilation on GCC/MinGW
2025-12-06 08:46:49 +08:00 · 2025-11-26 19:20:27 +01:00 · 2025-11-23 16:25:56 -05:00 · 2025-11-22 21:53:37 +00:00 · 2025-11-22 16:11:06 +00:00
1 changed files with 2 additions and 2 deletions
--- a/include/fast_float/float_common.h
+++ b/include/fast_float/float_common.h
@ -406,8 +406,8 @@ full_multiplication(uint64_t a, uint64_t b) {
  // But MinGW on ARM64 doesn't have native support for 64-bit multiplications
  answer.high = __umulh(a, b);
  answer.low = a * b;
-#elif defined(FASTFLOAT_32BIT) ||                                              \
-    (defined(_WIN64) && !defined(__clang__) && !defined(_M_ARM64))
+#elif defined(FASTFLOAT_32BIT) || (defined(_WIN64) && !defined(__clang__) &&   \
+                                   !defined(_M_ARM64) && !defined(__GNUC__))
  answer.low = _umul128(a, b, &answer.high); // _umul128 not available on ARM64
 #elif defined(FASTFLOAT_64BIT) && defined(__SIZEOF_INT128__)
  __uint128_t r = ((__uint128_t)a) * b;
Author	SHA1	Message	Date
Thomas Beutlich	358c4d7b71	Merge e6867f54b978ff992f4855ce7026a21c0f1a78b4 into f8c573d7419ab08de382c60005e37caa271e869a	2025-11-26 19:20:27 +01:00
Daniel Lemire	f8c573d741	Merge pull request #338 from Gravecat/mingw-fix Fixes compilation on GCC/MinGW	2025-11-23 16:25:56 -05:00
Raine 'Gravecat' Simmons	9d78a01ff7	Fixed formatting with clang-format	2025-11-22 21:53:37 +00:00
Raine 'Gravecat' Simmons	409d6215b4	Fixes compilation on GCC/MinGW	2025-11-22 16:11:06 +00:00