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"
git-mirror · Oct 16, 2014 · c11dc64 · c11dc64
2 parents 1cb3324 + 6433d56
commit c11dc64
Showing 1 changed file with 1 addition and 1 deletion.
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) {