Merge remote-tracking branch 'origin/maint-0.2.2'

This commit is contained in:
Nick Mathewson 2011-08-24 13:53:17 -04:00
commit ede9cd4f99
2 changed files with 8 additions and 0 deletions

4
changes/msvc_lround Normal file
View File

@ -0,0 +1,4 @@
o Build fixes:
- Provide a substitute implementation of lround() for MSVC, which
apparently lacks it. Patch from Gisle Vanem.

View File

@ -335,7 +335,11 @@ tor_mathlog(double d)
long long
tor_lround(double d) tor_lround(double d)
{ {
#ifdef _MSC_VER
return (long)(d > 0 ? d + 0.5 : ceil(d - 0.5));
#else
return lround(d); return lround(d);
#endif
} }
/** Returns floor(log2(u64)). If u64 is 0, (incorrectly) returns 0. */ /** Returns floor(log2(u64)). If u64 is 0, (incorrectly) returns 0. */