tor

commit d50f90bfc4457b499d5bf56b674289f70f1004bd
parent 2ae92ab973019cd88c5b610462a6be99a2ac4c6f
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu, 23 Aug 2018 19:37:32 -0400

Merge branch 'maint-0.3.4'

Diffstat:
A
changes/bug27185
 | 
3
+++
M
src/test/test.c
 | 
10
++--------

2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/changes/bug27185 b/changes/bug27185
@@ -0,0 +1,3 @@
+  o Minor bugfixes (Windows, compilation):
+    - Silence a compilation warning on MSVC 2017 and clang-cl.
+      Fixes bug 27185; bugfix on 0.2.2.2-alpha.
diff --git a/src/test/test.c b/src/test/test.c
@@ -26,6 +26,8 @@
 #include <dirent.h>
 #endif /* defined(_WIN32) */
 
+#include <math.h>
+
 /* These macros pull in declarations for some functions and structures that
  * are typically file-private. */
 #define ROUTER_PRIVATE
@@ -34,14 +36,6 @@
 #define MAIN_PRIVATE
 #define STATEFILE_PRIVATE
 
-/*
- * Linux doesn't provide lround in math.h by default, but mac os does...
- * It's best just to leave math.h out of the picture entirely.
- */
-//#include <math.h>
-long int lround(double x);
-double fabs(double x);
-
 #include "core/or/or.h"
 #include "lib/err/backtrace.h"
 #include "lib/container/buffers.h"