diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-08-23 19:36:45 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-08-23 19:36:45 -0400 |
| commit | e01ea64f0a072b321bb8b33e32cfa5644b4364d4 (patch) | |
| tree | d9ac5e43eeb08c539b149fba275f881c4bdab586 | |
| parent | 8691046ac668282de421bd66c14748faac693749 (diff) | |
| parent | 36bb11a65081bb0c2a2a86359c6386bde67f8046 (diff) | |
| download | tor-e01ea64f0a072b321bb8b33e32cfa5644b4364d4.tar.gz tor-e01ea64f0a072b321bb8b33e32cfa5644b4364d4.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
| -rw-r--r-- | changes/bug27185 | 3 | ||||
| -rw-r--r-- | src/test/test.c | 10 |
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 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" |