diff options
| author | Derick Rethans <github@derickrethans.nl> | 2018-12-23 17:54:57 +0000 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2018-12-23 17:54:57 +0000 |
| commit | a9a084c09292b239bfc6a1d3026ceb3733958555 (patch) | |
| tree | f8870812863c0d3b6ca8d6f17c386b84541498c1 | |
| parent | 3e4a3d005a80d0ba0f87635d3ebccda7df137d0d (diff) | |
| download | php-git-a9a084c09292b239bfc6a1d3026ceb3733958555.tar.gz | |
Update API use due to changes in timelib 2018.01RC3
| -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 c152c71d3d..7b1836e938 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -4032,7 +4032,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->bit32.timecnt - 1, timestamp_begin) +#define add_last() add(tzobj->tzi.tz->bit64.timecnt - 1, timestamp_begin) array_init(return_value); @@ -4043,7 +4043,7 @@ PHP_FUNCTION(timezone_transitions_get) } else { begin = 0; found = 0; - if (tzobj->tzi.tz->bit32.timecnt > 0) { + if (tzobj->tzi.tz->bit64.timecnt > 0) { do { if (tzobj->tzi.tz->trans[begin] > timestamp_begin) { if (begin > 0) { @@ -4055,19 +4055,19 @@ PHP_FUNCTION(timezone_transitions_get) break; } begin++; - } while (begin < tzobj->tzi.tz->bit32.timecnt); + } while (begin < tzobj->tzi.tz->bit64.timecnt); } } if (!found) { - if (tzobj->tzi.tz->bit32.timecnt > 0) { + if (tzobj->tzi.tz->bit64.timecnt > 0) { add_last(); } else { add_nominal(); } } else { unsigned int i; - for (i = begin; i < tzobj->tzi.tz->bit32.timecnt; ++i) { + for (i = begin; i < tzobj->tzi.tz->bit64.timecnt; ++i) { if (tzobj->tzi.tz->trans[i] < timestamp_end) { add(i, tzobj->tzi.tz->trans[i]); } |