felipe Fri Mar 14 17:57:44 2008 UTC
Modified files:
/php-src/ext/date php_date.c
Log:
Fix build (ZTS)
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.172&r2=1.173&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.172 php-src/ext/date/php_date.c:1.173
--- php-src/ext/date/php_date.c:1.172 Fri Mar 14 16:18:25 2008
+++ php-src/ext/date/php_date.c Fri Mar 14 17:57:44 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.172 2008/03/14 16:18:25 derick Exp $ */
+/* $Id: php_date.c,v 1.173 2008/03/14 17:57:44 felipe Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1780,7 +1780,7 @@
}
// first we add the date and time in ISO format
- str = date_format("Y-m-d H:i:s", 12, &return_len, dateobj->time, 1, 0);
+ str = date_format("Y-m-d H:i:s", 12, &return_len, dateobj->time, 1, 0
TSRMLS_CC);
MAKE_STD_ZVAL(zv);
if (UG(unicode)) {
ZVAL_UNICODEL(zv, (UChar*) str, return_len - 1, 0);
@@ -2075,7 +2075,7 @@
}
/* }}} */
-static int php_date_initialize_from_hash(zval **return_value, php_date_obj
**dateobj, HashTable *myht)
+static int php_date_initialize_from_hash(zval **return_value, php_date_obj
**dateobj, HashTable *myht TSRMLS_DC)
{
zval **z_date = NULL;
zval **z_timezone = NULL;
@@ -2137,7 +2137,7 @@
date_instantiate(date_ce_date, return_value TSRMLS_CC);
dateobj = (php_date_obj *) zend_object_store_get_object(return_value
TSRMLS_CC);
- php_date_initialize_from_hash(&return_value, &dateobj, myht);
+ php_date_initialize_from_hash(&return_value, &dateobj, myht TSRMLS_CC);
}
/* }}} */
@@ -2153,7 +2153,7 @@
myht = Z_OBJPROP_P(object);
- php_date_initialize_from_hash(&return_value, &dateobj, myht);
+ php_date_initialize_from_hash(&return_value, &dateobj, myht TSRMLS_CC);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php