summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-08-23 19:36:45 -0400
committerNick Mathewson <nickm@torproject.org>2018-08-23 19:36:45 -0400
commite01ea64f0a072b321bb8b33e32cfa5644b4364d4 (patch)
treed9ac5e43eeb08c539b149fba275f881c4bdab586 /src
parent8691046ac668282de421bd66c14748faac693749 (diff)
parent36bb11a65081bb0c2a2a86359c6386bde67f8046 (diff)
downloadtor-e01ea64f0a072b321bb8b33e32cfa5644b4364d4.tar.gz
tor-e01ea64f0a072b321bb8b33e32cfa5644b4364d4.zip
Merge branch 'maint-0.3.2' into maint-0.3.3
Diffstat (limited to 'src')
-rw-r--r--src/test/test.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/test/test.c b/src/test/test.c
index 2712de4ed1..2e7d399322 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -22,6 +22,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 GEOIP_PRIVATE
@@ -31,14 +33,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 "or.h"
#include "backtrace.h"
#include "buffers.h"