[tor-commits] [tor/maint-0.3.4] Silence a compilation warning on MSVC 2017 and clang-cl

nickm at torproject.org nickm at torproject.org
Thu Aug 23 23:40:37 UTC 2018


commit cc4ea34a262993bf69836d1bffa3175e24261565
Author: teor <teor at torproject.org>
Date:   Thu Aug 23 18:55:39 2018 +1000

    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.
---
 changes/bug27185 |  3 +++
 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 000000000..79221b3df
--- /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 0fef69790..6330eb9b9 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"





More information about the tor-commits mailing list