Merge branch 'bw/trace-no-inline-getnanotime'
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Oct 2014 21:16:45 +0000 (14:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Oct 2014 21:16:45 +0000 (14:16 -0700)
No file-scope static variables in an inlined function, please.

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

trace.c
diff --git a/trace.c b/trace.c
index b6f25a23fdf8b6eec64181b5d6b56909bbe4ae7b..477860894196e32d7db990459cef47175277c441 100644 (file)
--- 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) {