commit f92359b593b9eb72cea2a67fcfe01b94520dce5a
author Philip Withnall <philip@tecnocode.co.uk> Sat Aug 11 21:25:05 2018 +0000
committer Philip Withnall <philip@tecnocode.co.uk> Sat Aug 11 21:25:05 2018 +0000
tree f8910c668ad3841820f496ab1da8fd485141de01
parent cce309aebb64b44cf3ec2fd1bd317c85802f030d
parent de62a95d5e363669dc590b0bd879a38fe1f44d2f

Merge branch 'wjt/glib-mkenums-filename-basename-in-fhead-ftail' into 'master'

glib-mkenums: forbid @filename@/@basename@ in fhead and ftail

See merge request GNOME/glib!241

glib/gtimer.c

diff --git a/glib/gtimer.c b/glib/gtimer.c
index 76da128..2012255 100644
--- a/glib/gtimer.c
+++ b/glib/gtimer.c
@@ -497,7 +497,7 @@
       if (min > 59)
         return FALSE;
 
-      time_->tv_sec = mktime_utc (&tm) + (time_t) (60 * (60 * hour + min) * sign);
+      time_->tv_sec = mktime_utc (&tm) + (time_t) (60 * (gint64) (60 * hour + min) * sign);
     }
   else
     {