aboutsummaryrefslogtreecommitdiff
path: root/src/clock.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-02-27 20:00:14 +0100
committerMax Kellermann <max@duempel.org>2013-02-27 20:00:14 +0100
commit8017301de5207b49e6353c26bb5d98eceaf5db01 (patch)
tree07854a499d68b62c7ef700cba9b0e2ff8743c984 /src/clock.c
parent496f70fc0d717719a6defb645918785381efa22b (diff)
parent46528783ef07d1180d7059f3916d277a2f9a0c31 (diff)
Merge branch 'v0.17.x'
Diffstat (limited to 'src/clock.c')
-rw-r--r--src/clock.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/clock.c b/src/clock.c
index 4100fa2d..d987aed4 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
}