summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Walton <bdwalton@gmail.com>2014-09-28 07:50:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-09-29 23:13:58 (GMT)
commit6433d569753e8d33d3f7beca16a65f2fc481aade (patch)
tree81e530c1c765bee41e6418a8215a4c1b2eaedb41
parent62b553cdd6cd41d60b3e0c6fe4a85a951712df97 (diff)
downloadgit-6433d569753e8d33d3f7beca16a65f2fc481aade.zip
git-6433d569753e8d33d3f7beca16a65f2fc481aade.tar.gz
git-6433d569753e8d33d3f7beca16a65f2fc481aade.tar.bz2
trace.c: do not mark getnanotime() as "inline"
Oracle Studio compilers don't allow for static variables in functions that are defined to be inline. GNU C does permit this. Let's reference the C99 standard though, which doesn't allow for inline functions to contain modifiable static variables. Signed-off-by: Ben Walton <bdwalton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--trace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/trace.c b/trace.c
index e583dc6..03990df 100644
--- a/trace.c
+++ b/trace.c
@@ -384,7 +384,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) {