tor

commit 0f97f963e3c267852a3f28538c5ddb196ce0bb42
parent e88aa98451e5fe28b2840cf218dba67e4596aa56
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed,  5 Jul 2017 11:19:03 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

Diffstat:
A
changes/bug22801
 | 
5
+++++
M
src/common/util.c
 | 
12
++++++++++++

2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/changes/bug22801 b/changes/bug22801
@@ -0,0 +1,5 @@
+  o Minor bugfixes (compilation):
+    - When building with certain versions the mingw C header files, avoid
+      float-conversion warnings when calling the C functions isfinite(),
+      isnan(), and signbit(). Fixes bug 22801; bugfix on 0.2.8.1-alpha.
+
diff --git a/src/common/util.c b/src/common/util.c
@@ -5598,6 +5598,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;
@@ -5623,6 +5632,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. */