aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2018-08-23 18:55:39 +1000
committerteor <teor@torproject.org>2018-08-24 09:15:04 +1000
commitcc4ea34a262993bf69836d1bffa3175e24261565 (patch)
tree2024907f51cb8da59d76a5fef00042cbfc212a02
parent9068e2fa280395ba15d30465ec25141cff876922 (diff)
downloadtor-cc4ea34a262993bf69836d1bffa3175e24261565.tar.gz
tor-cc4ea34a262993bf69836d1bffa3175e24261565.zip
Silence a compilation warning on MSVC 2017 and clang-cl
test.c no longer uses lround(), so we don't need to declare it, and we can use math.h for fabs(). Fixes bug 27185; bugfix on 0.2.2.2-alpha.
-rw-r--r--changes/bug271853
-rw-r--r--src/test/test.c10
2 files changed, 5 insertions, 8 deletions
diff --git a/changes/bug27185 b/changes/bug27185
new file mode 100644
index 0000000000..79221b3df4
--- /dev/null
+++ 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
index 0fef697909..6330eb9b93 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -22,6 +22,8 @@
#include <dirent.h>
#endif
+#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"