diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2018-06-11 13:48:47 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2018-06-11 13:48:47 +0000 |
| commit | 8bbc38b497ee06d90248aa7b89ea16848ea811cb (patch) | |
| tree | 46964c461fb32048b1a54d5d8f40a10524587b8c | |
| parent | 73b229ab3a05bf3491915a953f3a3ae972e29957 (diff) | |
| parent | 137dd7789b870be7c5acc2e1dcdbb1f44442b8b1 (diff) | |
| download | glib-8bbc38b497ee06d90248aa7b89ea16848ea811cb.tar.gz | |
Merge branch '878-timezone-transitions' into 'master'
Resolve "glib uses wrong timezone transition with zoneinfo 2014c"
Closes #878
See merge request GNOME/glib!94
| -rw-r--r-- | glib/gtimezone.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/glib/gtimezone.c b/glib/gtimezone.c index 72a4916ad..b3220dc35 100644 --- a/glib/gtimezone.c +++ b/glib/gtimezone.c @@ -1677,7 +1677,10 @@ interval_end (GTimeZone *tz, guint interval) { if (tz->transitions && interval < tz->transitions->len) - return (TRANSITION(interval)).time - 1; + { + gint64 lim = (TRANSITION(interval)).time; + return lim - (lim != G_MININT64); + } return G_MAXINT64; } |