From 03f61deac0883d8ddbb970ed4b5be18eed780d12 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 14 Sep 2016 20:32:28 -0400 Subject: [PATCH] Cleanup: bt namespace for compat timegm MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- converter/babeltrace-log.c | 2 +- include/babeltrace/compat/utc.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c index db7f60f1..8cb35d13 100644 --- a/converter/babeltrace-log.c +++ b/converter/babeltrace-log.c @@ -230,7 +230,7 @@ void write_event_header(struct ctf_stream_pos *pos, char *line, ti.tm_min = min; ti.tm_sec = sec; - ep_sec = babeltrace_timegm(&ti); + ep_sec = bt_timegm(&ti); if (ep_sec != (time_t) -1) { *ts = (uint64_t) ep_sec * NSEC_PER_SEC + (uint64_t) msec * NSEC_PER_MSEC; diff --git a/include/babeltrace/compat/utc.h b/include/babeltrace/compat/utc.h index d59d8564..fd41f620 100644 --- a/include/babeltrace/compat/utc.h +++ b/include/babeltrace/compat/utc.h @@ -29,7 +29,7 @@ #if defined(_BSD_SOURCE) || defined(_SVID_SOURCE) static inline -time_t babeltrace_timegm(struct tm *tm) +time_t bt_timegm(struct tm *tm) { return timegm(tm); } @@ -47,7 +47,7 @@ time_t babeltrace_timegm(struct tm *tm) */ static inline -time_t babeltrace_timegm(struct tm *tm) +time_t bt_timegm(struct tm *tm) { time_t ret; char *tz; -- 2.34.1