andrei Wed Aug 24 13:16:15 2005 EDT
Modified files:
/php-src/ext/date php_date.c
Log:
Fix ZTS.
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.47&r2=1.48&ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.47 php-src/ext/date/php_date.c:1.48
--- php-src/ext/date/php_date.c:1.47 Wed Aug 24 13:10:25 2005
+++ php-src/ext/date/php_date.c Wed Aug 24 13:16:14 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.47 2005/08/24 17:10:25 derick Exp $ */
+/* $Id: php_date.c,v 1.48 2005/08/24 17:16:14 andrei Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -441,7 +441,7 @@
#define am_pm_lower_full(s,l) l ? loc_dat->am_pm_name[s] : am_pm_lower_names[s]
#define am_pm_upper_full(s,l) l ? loc_dat->am_pm_name[s] : am_pm_upper_names[s]
-static char *date_format(char *format, int format_len, int *return_len,
timelib_time *t, int localtime, int localized)
+static char *date_format(char *format, int format_len, int *return_len,
timelib_time *t, int localtime, int localized TSRMLS_DC)
{
smart_str string = {0};
int i, no_free, length;
@@ -610,7 +610,7 @@
timelib_unixtime2gmt(t, ts);
}
- string = date_format(format, format_len, &return_len, t, localtime, 0);
+ string = date_format(format, format_len, &return_len, t, localtime, 0
TSRMLS_CC);
if (localtime) {
timelib_tzinfo_dtor(tzi);
@@ -1172,7 +1172,7 @@
RETURN_FALSE;
}
dateobj = (php_date_obj *) zend_object_store_get_object(object
TSRMLS_CC);
- str = date_format(format, format_len, &length, dateobj->time,
dateobj->time->is_localtime, 0);
+ str = date_format(format, format_len, &length, dateobj->time,
dateobj->time->is_localtime, 0 TSRMLS_CC);
if (UG(unicode)) {
RETURN_UNICODEL((UChar*) str, length, 0);
} else {
@@ -1192,7 +1192,7 @@
}
dateobj = (php_date_obj *) zend_object_store_get_object(object
TSRMLS_CC);
- str = date_format(format, format_len, &length, dateobj->time,
dateobj->time->is_localtime, 1);
+ str = date_format(format, format_len, &length, dateobj->time,
dateobj->time->is_localtime, 1 TSRMLS_CC);
if (UG(unicode)) {
RETURN_UNICODEL((UChar*)str, length, 0);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
