Skip to content

Commit

Permalink
Merge branch 'bw/trace-no-inline-getnanotime'
Browse files Browse the repository at this point in the history
No file-scope static variables in an inlined function, please.

* bw/trace-no-inline-getnanotime:
  trace.c: do not mark getnanotime() as "inline"
  • Loading branch information
Junio C Hamano committed Oct 16, 2014
2 parents 1cb3324 + 6433d56 commit c11dc64
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit c11dc64

Please sign in to comment.