Cleanup: bt namespace for compat timegm

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c
index db7f60f1d2b60b2eeccf114ab24e2965a5641caa..8cb35d135877011ccd13a702cca8b8f1484c18af 100644 (file)
--- 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 d59d8564f47b6f37e9cd4fea5ccd8e83cc0ebfef..fd41f620091131dc53b4b9a50cd604b10ddc8104 100644 (file)
--- 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;