Merge branch 'ab/merge-file-prefix'

diff --git a/trace.c b/trace.c
index f6f9f3a367242f5f3f10e1d33381f0a52d4fbe55..1dc5c7c912d000699b753b1aab5c09a114e26557 100644 (file)
--- a/trace.c
+++ b/trace.c
@@ -322,7 +322,7 @@ int trace_want(struct trace_key *key)
        return !!get_trace_fd(key);
 }
 
-#ifdef HAVE_CLOCK_GETTIME
+#if defined(HAVE_CLOCK_GETTIME) && defined(HAVE_CLOCK_MONOTONIC)
 
 static inline uint64_t highres_nanos(void)
 {