mirror of
https://github.com/php/php-src.git
synced 2024-09-22 10:27:25 +00:00
- MFH: Change parameter name because NetWare expands "tzname" as a macro to
something else.
This commit is contained in:
parent
2cbe63513c
commit
6df3e40977
@ -278,16 +278,16 @@ PHP_MINFO_FUNCTION(date)
|
||||
/* }}} */
|
||||
|
||||
/* {{{ Timezone Cache functions */
|
||||
static timelib_tzinfo *php_date_parse_tzfile(char *tzname, timelib_tzdb *tzdb TSRMLS_DC)
|
||||
static timelib_tzinfo *php_date_parse_tzfile(char *formal_tzname, timelib_tzdb *tzdb TSRMLS_DC)
|
||||
{
|
||||
timelib_tzinfo *tzi, **ptzi;
|
||||
|
||||
if (zend_hash_find(&DATEG(tzcache), tzname, strlen(tzname) + 1, (void **) &ptzi) == SUCCESS) {
|
||||
if (zend_hash_find(&DATEG(tzcache), formal_tzname, strlen(formal_tzname) + 1, (void **) &ptzi) == SUCCESS) {
|
||||
return *ptzi;
|
||||
}
|
||||
|
||||
tzi = timelib_parse_tzfile(tzname, tzdb);
|
||||
zend_hash_add(&DATEG(tzcache), tzname, strlen(tzname) + 1, (void *) &tzi, sizeof(timelib_tzinfo*), NULL);
|
||||
tzi = timelib_parse_tzfile(formal_tzname, tzdb);
|
||||
zend_hash_add(&DATEG(tzcache), formal_tzname, strlen(formal_tzname) + 1, (void *) &tzi, sizeof(timelib_tzinfo*), NULL);
|
||||
return tzi;
|
||||
}
|
||||
/* }}} */
|
||||
|
Loading…
Reference in New Issue
Block a user