diff options
author | Max Kellermann <max@duempel.org> | 2013-02-27 20:00:14 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2013-02-27 20:00:14 +0100 |
commit | 8017301de5207b49e6353c26bb5d98eceaf5db01 (patch) | |
tree | 07854a499d68b62c7ef700cba9b0e2ff8743c984 /src/clock.c | |
parent | 496f70fc0d717719a6defb645918785381efa22b (diff) | |
parent | 46528783ef07d1180d7059f3916d277a2f9a0c31 (diff) | |
download | mpd-8017301de5207b49e6353c26bb5d98eceaf5db01.tar.gz mpd-8017301de5207b49e6353c26bb5d98eceaf5db01.tar.xz mpd-8017301de5207b49e6353c26bb5d98eceaf5db01.zip |
Merge branch 'v0.17.x'
Diffstat (limited to 'src/clock.c')
-rw-r--r-- | src/clock.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/clock.c b/src/clock.c index 4100fa2d8..d987aed48 100644 --- a/src/clock.c +++ b/src/clock.c @@ -25,6 +25,9 @@ #include <mach/mach_time.h> #else #include <time.h> +#ifndef CLOCK_MONOTONIC +#include <sys/time.h> +#endif #endif unsigned @@ -89,7 +92,7 @@ monotonic_clock_us(void) /* we have no monotonic clock, fall back to gettimeofday() */ struct timeval tv; gettimeofday(&tv, 0); - return (uint64_t)tv.tv_sec * 1000 + (uint64_t)(tv.tv_usec) / 1000(; + return (uint64_t)tv.tv_sec * 1000 + (uint64_t)tv.tv_usec; #endif } |