summaryrefslogtreecommitdiff
path: root/trace.c
diff options
context:
space:
mode:
authorReuben Hawkins <reubenhwk@gmail.com>2015-01-08 12:00:56 -0800
committerJunio C Hamano <gitster@pobox.com>2015-01-09 15:33:39 -0800
commita6c3c638acea34116c6be7cc4be41a9bc55a7fa1 (patch)
treeb1921a1fdacdf8d6e27ff9db1c9e60be16046ffc /trace.c
parent8bd2c972b1e2343620cad5b0f56de0f2524b7564 (diff)
downloadgit-a6c3c638acea34116c6be7cc4be41a9bc55a7fa1.tar.gz
configure.ac: check for clock_gettime and CLOCK_MONOTONIC
Set or clear Makefile variables HAVE_CLOCK_GETTIME and HAVE_CLOCK_MONOTONIC based upon results of the checks (overriding default values from config.mak.uname). CLOCK_MONOTONIC isn't available on RHEL3, but there are still RHEL3 systems being used in production. Signed-off-by: Reuben Hawkins <reubenhwk@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'trace.c')
-rw-r--r--trace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/trace.c b/trace.c
index f6f9f3a367..1dc5c7c912 100644
--- 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)
{