Merge branch 'maint-0.2.8' into release-0.2.8

2016-12-07 18:26:43 -05:00 · 2016-12-07 18:26:43 -05:00 · 38daa8f3cc
parent f6614c751b 10baf2c684
commit 38daa8f3cc
1 changed files with 5 additions and 0 deletions
--- a/src/common/compat_pthreads.c
+++ b/src/common/compat_pthreads.c
@ -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.
 */