comparison src/util.c @ 10876:4fdc8a1102c0

[gaim-migrate @ 12567] ditto for head committer: Tailor Script <[e-mail]>

10875:a118e50116df

				tzoff = tzhrs*60*60 + tzmins*60;
				if (*c == '+')
					tzoff *= -1;
			}

			if (tzoff || utc) {
#ifdef HAVE_TM_GMTOFF
				tzoff += t->tm_gmtoff;
#else
#	ifdef HAVE_TIMEZONE
				tzset();    /* making sure */
				tzoff -= timezone;
#	endif
#endif
			}
		}
	}

	t->tm_isdst = -1;
	retval = mktime(t);
	retval += tzoff;

	return retval;
}

10876:4fdc8a1102c0

				tzoff = tzhrs*60*60 + tzmins*60;
				if (*c == '+')
					tzoff *= -1;
			}

			t->tm_isdst = -1;

			if (tzoff || utc) {
#ifdef HAVE_TM_GMTOFF
				tzoff += t->tm_gmtoff;
#else
#	ifdef HAVE_TIMEZONE
				tzset();    /* making sure */
				tzoff -= timezone;
				t->tm_isdst = 0; /* I think this might fix it */
#	endif
#endif
			}
		}
	}

	retval = mktime(t);
	retval += tzoff;

	return retval;
}