Fixup merge

1 files changed, 1 insertions, 3 deletions

diff --git a/src/utils/time.cpp b/src/utils/time.cpp
index 39c9dd49d..77ad0eec5 100644
--- a/src/utils/time.cpp
+++ b/src/utils/time.cpp
@@ -47,7 +47,7 @@ u64bit combine_timers(u32bit seconds, u32bit parts, u32bit parts_hz)
    return res;
    }
 
-std::tm do_gmtime(time_t time_val)
+std::tm do_gmtime(std::time_t time_val)
    {
    std::tm tm;
 
@@ -75,8 +75,6 @@ calendar_point calendar_value(
    {
    std::tm tm = do_gmtime(std::chrono::system_clock::to_time_t(time_point));
 
-   std::tm tm = do_gmtime(time_val);
-
    return calendar_point(tm.tm_year + 1900,
                          tm.tm_mon + 1,
                          tm.tm_mday,