Merged, thanks! Jérémie
On 13 November 2017 at 15:06, Michael Jeanson <[email protected]> wrote: > On Solaris 11 setting TZ to an empty string before calling mktime will > in some circumstances do the conversion in localtime instead of UTC as > expected. > > Replace the empty string by "UTC". > > Signed-off-by: Michael Jeanson <[email protected]> > --- > include/babeltrace/compat/utc.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/babeltrace/compat/utc.h b/include/babeltrace/compat/utc.h > index d59d856..ab080f2 100644 > --- a/include/babeltrace/compat/utc.h > +++ b/include/babeltrace/compat/utc.h > @@ -67,8 +67,8 @@ time_t babeltrace_timegm(struct tm *tm) > } > } > > - /* Temporarily setting TZ to 1 for UTC */ > - setenv("TZ", "", 1); > + /* Temporarily setting TZ to UTC */ > + setenv("TZ", "UTC", 1); > tzset(); > ret = mktime(tm); > if (tz) { > -- > 2.7.4 > -- Jérémie Galarneau EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
