From 5b9d65e873fd8e5f6692b28df7bbaebd5db35099 Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Fri, 7 Oct 2005 13:33:13 +0000 Subject: [PATCH] - Change parameter name because NetWare expands "tzname" as a macro to something else. --- ext/date/php_date.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 20865106aa..9f45a62b9d 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -280,16 +280,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; } /* }}} */ -- 2.40.0