diff options
| author | Derick Rethans <github@derickrethans.nl> | 2015-04-29 00:29:04 +0100 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2015-04-29 00:29:04 +0100 |
| commit | c2ef8a9acc7977d07a9a92b07352cdefa7c4b9a5 (patch) | |
| tree | 4f8dce9ac7074d513e803d85a94570956c4001cc | |
| parent | 0f4d527722aec23f3599d2b75f51f83dffddf6f6 (diff) | |
| parent | ce9b6e5ee80c26a5cb785abdec60510f6b7620e8 (diff) | |
| download | php-git-c2ef8a9acc7977d07a9a92b07352cdefa7c4b9a5.tar.gz | |
Merge branch 'PHP-5.6'
| -rw-r--r-- | ext/date/php_date.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index f00ce047b4..4ca8d19e24 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -3850,7 +3850,7 @@ PHP_FUNCTION(timezone_transitions_get) add_assoc_string(&element, "abbr", &tzobj->tzi.tz->timezone_abbr[tzobj->tzi.tz->type[tzobj->tzi.tz->trans_idx[i]].abbr_idx]); \ add_next_index_zval(return_value, &element); -#define add_last() add(tzobj->tzi.tz->timecnt - 1, timestamp_begin) +#define add_last() add(tzobj->tzi.tz->bit32.timecnt - 1, timestamp_begin) array_init(return_value); @@ -3861,7 +3861,7 @@ PHP_FUNCTION(timezone_transitions_get) } else { begin = 0; found = 0; - if (tzobj->tzi.tz->timecnt > 0) { + if (tzobj->tzi.tz->bit32.timecnt > 0) { do { if (tzobj->tzi.tz->trans[begin] > timestamp_begin) { if (begin > 0) { @@ -3873,18 +3873,18 @@ PHP_FUNCTION(timezone_transitions_get) break; } begin++; - } while (begin < tzobj->tzi.tz->timecnt); + } while (begin < tzobj->tzi.tz->bit32.timecnt); } } if (!found) { - if (tzobj->tzi.tz->timecnt > 0) { + if (tzobj->tzi.tz->bit32.timecnt > 0) { add_last(); } else { add_nominal(); } } else { - for (i = begin; i < tzobj->tzi.tz->timecnt; ++i) { + for (i = begin; i < tzobj->tzi.tz->bit32.timecnt; ++i) { if (tzobj->tzi.tz->trans[i] < timestamp_end) { add(i, tzobj->tzi.tz->trans[i]); } |