diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-10-16 14:16:45 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-10-16 14:16:45 -0700 |
commit | c11dc64722fc0bb496efb1b6de87012a132c04fc (patch) | |
tree | 59b5faa329e694740dec3ca0c48bee4ad2aafe21 /trace.c | |
parent | 1cb3324e6152f3b35a7175b84a82b714290090fa (diff) | |
parent | 6433d569753e8d33d3f7beca16a65f2fc481aade (diff) | |
download | git-c11dc64722fc0bb496efb1b6de87012a132c04fc.tar.gz |
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"
Diffstat (limited to 'trace.c')
-rw-r--r-- | trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) { |