From: Derick Rethans <derick@php.net>
Date: Fri, 7 Oct 2005 13:33:31 +0000 (+0000)
Subject: - MFH: Change parameter name because NetWare expands "tzname" as a macro to
X-Git-Tag: php-5.1.0RC2~75
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6df3e40977abc7204c3bff65c55a1a98705cfa98;p=php

- MFH: Change parameter name because NetWare expands "tzname" as a macro to
  something else.
---

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 48b74a8784..a2c6c78568 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -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;
 }
 /* }}} */