Merge branch 'maint-0.2.9' into maint-0.3.2

This commit is contained in:
Nick Mathewson 2018-08-23 19:36:45 -04:00
commit 36bb11a650
2 changed files with 5 additions and 8 deletions

3
changes/bug27185 Normal file
View File

@ -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.

View File

@ -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"