diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-08 09:07:28 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-08 09:07:28 -0500 |
| commit | 9c899dad31c9b172ed19804d64dd6ee0e2cefa8a (patch) | |
| tree | e3062a52830d6a23fd250b17d4a6d8dca1480db8 /src | |
| parent | 4732e150e83fdc4d07f5741ed6e9451901b0e9e2 (diff) | |
| parent | 10baf2c6845f93ade7d412ad27efb625e513160e (diff) | |
| download | tor-9c899dad31c9b172ed19804d64dd6ee0e2cefa8a.tar.gz tor-9c899dad31c9b172ed19804d64dd6ee0e2cefa8a.zip | |
Merge remote-tracking branch 'origin/maint-0.2.8' into maint-0.2.8
Diffstat (limited to 'src')
| -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. */ |