diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-02-17 07:47:27 +0100 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-02-17 07:47:27 +0100 |
| commit | 0a331f49c1c39fc84b972c5f609d56ca21565a69 (patch) | |
| tree | 0e20c6f59900ab179054746b421336139996a35e /ext/date | |
| parent | c538a2eb120e3f0dd1e199456d5951dcf929f9f9 (diff) | |
| parent | 213725057e0625829615f90f76cbb0172f757a33 (diff) | |
| download | php-git-0a331f49c1c39fc84b972c5f609d56ca21565a69.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix TS build
Diffstat (limited to 'ext/date')
| -rw-r--r-- | ext/date/php_date.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 15ca08d3a9..6a9cd47525 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -3767,7 +3767,7 @@ PHP_METHOD(DateTimeZone, __set_state) php_date_instantiate(date_ce_timezone, return_value TSRMLS_CC); tzobj = (php_timezone_obj *) zend_object_store_get_object(return_value TSRMLS_CC); if(php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht TSRMLS_CC) != SUCCESS) { - php_error_docref(NULL, E_ERROR, "Timezone initialization failed"); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Timezone initialization failed"); } } /* }}} */ @@ -3785,7 +3785,7 @@ PHP_METHOD(DateTimeZone, __wakeup) myht = Z_OBJPROP_P(object); if(php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht TSRMLS_CC) != SUCCESS) { - php_error_docref(NULL, E_ERROR, "Timezone initialization failed"); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Timezone initialization failed"); } } /* }}} */ |