From cb870464b44a0eec989ddc1955eb049c5df3624a Mon Sep 17 00:00:00 2001 From: Shaun Merrigan Date: Fri, 5 Oct 2001 10:14:05 +0000 Subject: [PATCH] Only use tm_gmtoffm if __USE_BSD is defined. 2001-10-05 Shaun Merrigan * archiver-client.c (location_client_load_rollback_data): Only use tm_gmtoffm if __USE_BSD is defined. --- archiver/ChangeLog | 5 +++++ archiver/archiver-client.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/archiver/ChangeLog b/archiver/ChangeLog index ad92f78d0..09e618927 100644 --- a/archiver/ChangeLog +++ b/archiver/ChangeLog @@ -1,3 +1,8 @@ +2001-10-05 Shaun Merrigan + + * archiver-client.c (location_client_load_rollback_data): + Only use tm_gmtoffm if __USE_BSD is defined. + 2001-09-28 Bradford Hovinen * config-log.c (parse_line): Only set tm_gmtoff and tm_zone fields diff --git a/archiver/archiver-client.c b/archiver/archiver-client.c index 7d649d868..c941e3272 100644 --- a/archiver/archiver-client.c +++ b/archiver/archiver-client.c @@ -83,7 +83,10 @@ location_client_load_rollback_data (ConfigArchiver_Location location, if (date != NULL) { date_c = dup_date (date); - time_g = mktime (date_c) + date_c->tm_gmtoff; + time_g = mktime (date_c); +#ifdef __USE_BSD + time_g += date_c->tm_gmtoff; +#endif /* __USE_BSD */ if (date_c->tm_isdst) time_g -= 3600; g_free (date_c); } else {