diff options
| author | Ondřej Surý <ondrej@sury.org> | 2014-12-21 19:07:19 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2014-12-21 19:07:19 +0100 |
| commit | 60fede4c90746ef3408ed27a15dd405b3a46a83b (patch) | |
| tree | 068e6a8018345664b5d0e8d838995a4a3e97cc3d /ext/date/lib/parse_tz.c | |
| parent | f40f1ce174885cd0f526c003eca3fa523e0ef269 (diff) | |
| download | php-upstream/5.6.4+dfsg.tar.gz | |
New upstream version 5.6.4+dfsgupstream/5.6.4+dfsg
Diffstat (limited to 'ext/date/lib/parse_tz.c')
| -rw-r--r-- | ext/date/lib/parse_tz.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c index 5d2aec9c9..5e6250b8b 100644 --- a/ext/date/lib/parse_tz.c +++ b/ext/date/lib/parse_tz.c @@ -336,7 +336,7 @@ static ttinfo* fetch_timezone_offset(timelib_tzinfo *tz, timelib_sll ts, timelib { uint32_t i; - /* If there is no transistion time, we pick the first one, if that doesn't + /* If there is no transition time, we pick the first one, if that doesn't * exist we return NULL */ if (!tz->timecnt || !tz->trans) { *transition_time = 0; @@ -346,8 +346,8 @@ static ttinfo* fetch_timezone_offset(timelib_tzinfo *tz, timelib_sll ts, timelib return NULL; } - /* If the TS is lower than the first transistion time, then we scan over - * all the transistion times to find the first non-DST one, or the first + /* If the TS is lower than the first transition time, then we scan over + * all the transition times to find the first non-DST one, or the first * one in case there are only DST entries. Not sure which smartass came up * with this idea in the first though :) */ if (ts < tz->trans[0]) { |