diff options
| author | teor <teor@torproject.org> | 2019-10-24 10:00:47 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-24 10:00:47 +1000 |
| commit | 20606b8a15483b1709dac48fd44f758e292607b8 (patch) | |
| tree | 74aec1e696fe6e5eb32e7a8d8251d812e4541865 /src/lib/wallclock/timeval.h | |
| parent | 9586ae178a38436e07278f141801208c04b37191 (diff) | |
| parent | 931a5db2a7ded73ddd72cb6646b506d49782f3ec (diff) | |
| download | tor-20606b8a15483b1709dac48fd44f758e292607b8.tar.gz tor-20606b8a15483b1709dac48fd44f758e292607b8.zip | |
Merge remote-tracking branch 'tor-github/pr/1447'
Diffstat (limited to 'src/lib/wallclock/timeval.h')
| -rw-r--r-- | src/lib/wallclock/timeval.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/wallclock/timeval.h b/src/lib/wallclock/timeval.h index e632d04a04..4710a3dfd7 100644 --- a/src/lib/wallclock/timeval.h +++ b/src/lib/wallclock/timeval.h @@ -69,6 +69,7 @@ } while (0) #endif /* !defined(timersub) */ +#ifndef COCCI #ifndef timercmp /** Replacement for timercmp on platforms that do not have it: returns true * iff the relational operator "op" makes the expression tv1 op tv2 true. @@ -82,5 +83,6 @@ ((tv1)->tv_usec op (tv2)->tv_usec) : \ ((tv1)->tv_sec op (tv2)->tv_sec)) #endif /* !defined(timercmp) */ +#endif /* !defined(COCCI) */ #endif /* !defined(TOR_TIMEVAL_H) */ |