sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.3.1' into release-0.3.1

This commit is contained in:
Nick Mathewson 2017-07-05 16:11:48 -04:00
parent c8e6b2e4bf 15b13578e8
commit adae5d3b69
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/util.c
View File

@ -5598,13 +5598,14 @@ clamp_double_to_int64(double number)
{ {
int exponent; int exponent;
#if defined(__MINGW32__) || defined(__MINGW64__) #if (defined(__MINGW32__) || defined(__MINGW64__)) && GCC_VERSION >= 409
/* /*
Mingw's math.h uses gcc's __builtin_choose_expr() facility to declare Mingw's math.h uses gcc's __builtin_choose_expr() facility to declare
isnan, isfinite, and signbit. But as implemented in at least some isnan, isfinite, and signbit. But as implemented in at least some
versions of gcc, __builtin_choose_expr() can generate type warnings versions of gcc, __builtin_choose_expr() can generate type warnings
even from branches that are not taken. So, suppress those warnings. even from branches that are not taken. So, suppress those warnings.
*/ */
#define PROBLEMATIC_FLOAT_CONVERSION_WARNING
DISABLE_GCC_WARNING(float-conversion) DISABLE_GCC_WARNING(float-conversion)
#endif #endif
/* NaN is a special case that can't be used with the logic below. */ /* NaN is a special case that can't be used with the logic below. */
@ -5632,7 +5633,7 @@ DISABLE_GCC_WARNING(float-conversion)
/* Handle infinities and finite numbers with magnitude >= 2^63. */ /* Handle infinities and finite numbers with magnitude >= 2^63. */
return signbit(number) ? INT64_MIN : INT64_MAX; return signbit(number) ? INT64_MIN : INT64_MAX;
#if defined(__MINGW32__) || defined(__MINGW64__) #ifdef PROBLEMATIC_FLOAT_CONVERSION_WARNING
ENABLE_GCC_WARNING(float-conversion) ENABLE_GCC_WARNING(float-conversion)
#endif #endif
} }