From d9d1fb83aa965e979c026b83ef912ea6ccc9556a Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Tue, 11 Apr 2000 23:40:38 +0000 Subject: use HAVE_TIMEZONE to switch between linux's timezone variable and *bsd's * pcs/icalendar.c (icaltime_to_timet): use HAVE_TIMEZONE to switch between linux's timezone variable and *bsd's method of getting the gmt offset. svn path=/trunk/; revision=2399 --- calendar/cal-util/icalendar.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'calendar/cal-util/icalendar.c') diff --git a/calendar/cal-util/icalendar.c b/calendar/cal-util/icalendar.c index 0a0f39c636..1dcbadc817 100644 --- a/calendar/cal-util/icalendar.c +++ b/calendar/cal-util/icalendar.c @@ -365,7 +365,6 @@ this may not be correct */ static time_t icaltime_to_timet (struct icaltimetype* i) { - extern long timezone; struct tm t; time_t ret; @@ -384,7 +383,19 @@ static time_t icaltime_to_timet (struct icaltimetype* i) ret = mktime(&t); - return ret - (i->is_utc ? timezone : 0); + if (i->is_utc) { +#ifdef HAVE_TIMEZONE + extern long timezone; + ret -= timezone; +#else + struct tm *tmp; + time_t tod = time(NULL); + tmp = localtime (&tod); + ret += tmp->tm_gmtoff; +#endif + } + + return ret; } static iCalPerson* -- cgit