summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGisle Vanem <gvanem@broadpark.no>2011-08-24 13:52:44 -0400
committerNick Mathewson <nickm@torproject.org>2011-08-24 13:52:44 -0400
commit5939c09d35de5be4b135bb0ad6dde24700e75fc2 (patch)
treeffe6c5da89cf4d6630349e0a2f0d2b6435931edd
parentd79d648edcc19d1f11758016108fdbb57c80b4d0 (diff)
downloadtor-5939c09d35de5be4b135bb0ad6dde24700e75fc2.tar.gz
tor-5939c09d35de5be4b135bb0ad6dde24700e75fc2.zip
lround() missing in MSVC
lround() is missing in MS Visual-C's <math.h>. Not available anywhere. Here is an easy patch.
-rw-r--r--changes/msvc_lround4
-rw-r--r--src/common/util.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/msvc_lround b/changes/msvc_lround
new file mode 100644
index 0000000000..e4aea95351
--- /dev/null
+++ b/changes/msvc_lround
@@ -0,0 +1,4 @@
+ o Build fixes:
+ - Provide a substitute implementation of lround() for MSVC, which
+ apparently lacks it. Patch from Gisle Vanem.
+
diff --git a/src/common/util.c b/src/common/util.c
index b47b9c5fa2..ee0acbbb07 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -334,7 +334,11 @@ tor_mathlog(double d)
long
tor_lround(double d)
{
+#ifdef _MSC_VER
+ return (long)(d > 0 ? d + 0.5 : ceil(d - 0.5));
+#else
return lround(d);
+#endif
}
/** Returns floor(log2(u64)). If u64 is 0, (incorrectly) returns 0. */