[tor-commits] [tor/maint-0.4.0] Ticket 31687: fix for tor_isinf() as well

[nickm at torproject.org]

commit 34bab120df213970edf32db1f3462ff2585ee098
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 12 09:53:13 2019 -0400

    Ticket 31687: fix for tor_isinf() as well
    
    tor_isinf() was new in 0.4.0, and also needs to look at the
    same rules as clamp_double_to_i64()
---
 src/lib/math/fp.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/lib/math/fp.c b/src/lib/math/fp.c
index 9d93eaa87..616e4f15c 100644
--- a/src/lib/math/fp.c
+++ b/src/lib/math/fp.c
@@ -127,16 +127,12 @@ int
 tor_isinf(double x)
 {
   /* Same as above, work around the "double promotion" warnings */
-#if defined(MINGW_ANY) && GCC_VERSION >= 409
-#define PROBLEMATIC_FLOAT_CONVERSION_WARNING
+#ifdef PROBLEMATIC_FLOAT_CONVERSION_WARNING
 DISABLE_GCC_WARNING(float-conversion)
-#endif /* defined(MINGW_ANY) && GCC_VERSION >= 409 */
-#if defined(__clang__)
-#if __has_warning("-Wdouble-promotion")
-#define PROBLEMATIC_DOUBLE_PROMOTION_WARNING
+#endif
+#ifdef PROBLEMATIC_DOUBLE_PROMOTION_WARNING
 DISABLE_GCC_WARNING(double-promotion)
 #endif
-#endif /* defined(__clang__) */
   return isinf(x);
 #ifdef PROBLEMATIC_DOUBLE_PROMOTION_WARNING
 ENABLE_GCC_WARNING(double-promotion)
@@ -145,4 +141,3 @@ ENABLE_GCC_WARNING(double-promotion)
 ENABLE_GCC_WARNING(float-conversion)
 #endif
 }
-