derick Fri Oct 7 09:33:31 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/date php_date.c
Log:
- MFH: Change parameter name because NetWare expands "tzname" as a macro to
something else.
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.43.2.12&r2=1.43.2.13&ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.12
php-src/ext/date/php_date.c:1.43.2.13
--- php-src/ext/date/php_date.c:1.43.2.12 Wed Oct 5 07:06:56 2005
+++ php-src/ext/date/php_date.c Fri Oct 7 09:33:31 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.43.2.12 2005/10/05 11:06:56 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.13 2005/10/07 13:33:31 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -278,16 +278,16 @@
/* }}} */
/* {{{ 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;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
