sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.8' into maint-0.2.8

This commit is contained in:
Nick Mathewson 2016-12-08 09:07:28 -05:00
parent 4732e150e8 10baf2c684
commit 9c899dad31
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/compat_pthreads.c
View File

@ -21,6 +21,11 @@
#include "torlog.h"
#include "util.h"
#ifdef __APPLE__
#undef CLOCK_MONOTONIC
#undef HAVE_CLOCK_GETTIME
#endif
/** Wraps a void (*)(void*) function and its argument so we can
* invoke them in a way pthreads would expect.
*/