diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-07 18:26:43 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-07 18:26:43 -0500 |
| commit | 38daa8f3cc7d8a62a852673dd062842a137fb86e (patch) | |
| tree | 87f86c621ade1f16c2005498fd665b09e3ab0d61 | |
| parent | f6614c751b4481df12aa18819a5694614c7bc6ac (diff) | |
| parent | 10baf2c6845f93ade7d412ad27efb625e513160e (diff) | |
| download | tor-38daa8f3cc7d8a62a852673dd062842a137fb86e.tar.gz tor-38daa8f3cc7d8a62a852673dd062842a137fb86e.zip | |
Merge branch 'maint-0.2.8' into release-0.2.8
| -rw-r--r-- | src/common/compat_pthreads.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c index 1b24cc3c2a..962b5fc0e4 100644 --- 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. */ |