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

gitster · gitster · commit c11dc64722fc · 2014-10-16T14:16:45.000-07:00
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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,7 @@ static inline uint64_t gettimeofday_nanos(void)`
`385`	`385`	`* Returns nanoseconds since the epoch (01/01/1970), for performance tracing`
`386`	`386`	`* (i.e. favoring high precision over wall clock time accuracy).`
`387`	`387`	`*/`
`388`		`-inline uint64_t getnanotime(void)`
	`388`	`+uint64_t getnanotime(void)`
`389`	`389`	`{`
`390`	`390`	`static uint64_t offset;`
`391`	`391`	`if (offset > 1) {`