felipe Sun, 21 Nov 2010 17:41:33 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=305616
Log:
- Fixed ZTS build
Changed paths:
U php/php-src/branches/PHP_5_3/ext/intl/dateformat/dateformat_format.c
U php/php-src/trunk/ext/intl/dateformat/dateformat_format.c
Modified: php/php-src/branches/PHP_5_3/ext/intl/dateformat/dateformat_format.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/intl/dateformat/dateformat_format.c
2010-11-21 17:00:04 UTC (rev 305615)
+++ php/php-src/branches/PHP_5_3/ext/intl/dateformat/dateformat_format.c
2010-11-21 17:41:33 UTC (rev 305616)
@@ -170,7 +170,7 @@
INIT_ZVAL(retval);
MAKE_STD_ZVAL(zfuncname);
ZVAL_STRING(zfuncname, "getTimestamp", 1);
- if(call_user_function(NULL, &zarg, zfuncname, &retval,
0, NULL) != SUCCESS || Z_TYPE(retval) != IS_LONG) {
+ if(call_user_function(NULL, &zarg, zfuncname, &retval,
0, NULL TSRMLS_CC) != SUCCESS || Z_TYPE(retval) != IS_LONG) {
intl_errors_set(INTL_DATA_ERROR_P(dfo),
U_ILLEGAL_ARGUMENT_ERROR, "datefmt_format: cannot get timestamp", 0 TSRMLS_CC );
zval_ptr_dtor(&zfuncname);
RETURN_FALSE;
Modified: php/php-src/trunk/ext/intl/dateformat/dateformat_format.c
===================================================================
--- php/php-src/trunk/ext/intl/dateformat/dateformat_format.c 2010-11-21
17:00:04 UTC (rev 305615)
+++ php/php-src/trunk/ext/intl/dateformat/dateformat_format.c 2010-11-21
17:41:33 UTC (rev 305616)
@@ -170,7 +170,7 @@
INIT_ZVAL(retval);
MAKE_STD_ZVAL(zfuncname);
ZVAL_STRING(zfuncname, "getTimestamp", 1);
- if(call_user_function(NULL, &zarg, zfuncname, &retval,
0, NULL) != SUCCESS || Z_TYPE(retval) != IS_LONG) {
+ if(call_user_function(NULL, &zarg, zfuncname, &retval,
0, NULL TSRMLS_CC) != SUCCESS || Z_TYPE(retval) != IS_LONG) {
intl_errors_set(INTL_DATA_ERROR_P(dfo),
U_ILLEGAL_ARGUMENT_ERROR, "datefmt_format: cannot get timestamp", 0 TSRMLS_CC );
zval_ptr_dtor(&zfuncname);
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
