From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 16 Oct 2014 21:16:45 +0000 (-0700)
Subject: Merge branch 'bw/trace-no-inline-getnanotime'
X-Git-Tag: v2.2.0-rc0~44
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c11dc64722fc0bb496efb1b6de87012a132c04fc?hp=1cb3324e6152f3b35a7175b84a82b714290090fa

Merge branch 'bw/trace-no-inline-getnanotime'

No file-scope static variables in an inlined function, please.

* bw/trace-no-inline-getnanotime:
trace.c: do not mark getnanotime() as "inline"
---

diff --git a/trace.c b/trace.c
index b6f25a23fd..4778608941 100644
--- a/trace.c
+++ b/trace.c
@@ -385,7 +385,7 @@ static inline uint64_t gettimeofday_nanos(void)
  * Returns nanoseconds since the epoch (01/01/1970), for performance tracing
  * (i.e. favoring high precision over wall clock time accuracy).
  */
-inline uint64_t getnanotime(void)
+uint64_t getnanotime(void)
 {
 	static uint64_t offset;
 	if (offset > 1) {