Commit 6e0872e8 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'maint-0.3.3' into maint-0.3.4

parents ced35088 e01ea64f

changes/bug27185

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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.

src/test/test.c

+2 −8
Original line number Diff line number Diff line
@@ -23,6 +23,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
@@ -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"