Merge branch 'maint-0.2.9' into maint-0.3.0

1 files changed, 12 insertions, 0 deletions

diff --git a/src/common/util.c b/src/common/util.c
index f980fa296c..fef30e4a5f 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -5734,6 +5734,15 @@ clamp_double_to_int64(double number)
 {
   int exponent;
 
+#if defined(__MINGW32__) || defined(__MINGW64__)
+/*
+  Mingw's math.h uses gcc's __builtin_choose_expr() facility to declare
+  isnan, isfinite, and signbit.  But as implemented in at least some
+  versions of gcc, __builtin_choose_expr() can generate type warnings
+  even from branches that are not taken.  So, suppress those warnings.
+*/
+DISABLE_GCC_WARNING(float-conversion)
+#endif
   /* NaN is a special case that can't be used with the logic below. */
   if (isnan(number)) {
     return 0;
@@ -5759,6 +5768,9 @@ clamp_double_to_int64(double number)
 
   /* Handle infinities and finite numbers with magnitude >= 2^63. */
   return signbit(number) ? INT64_MIN : INT64_MAX;
+#if defined(__MINGW32__) || defined(__MINGW64__)
+ENABLE_GCC_WARNING(float-conversion)
+#endif
 }
 
 /** Return a uint64_t value from <b>a</b> in network byte order. */