Merge branch 'PHP-5.5' into PHP-5.6

smalyshev · smalyshev · commit 0a331f49c1c3 · 2015-02-17T07:47:27.000+01:00
* PHP-5.5:
  fix TS build
diff --git 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");
 	}
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -3767,7 +3767,7 @@ PHP_METHOD(DateTimeZone, __set_state)`
`3767`	`3767`	`php_date_instantiate(date_ce_timezone, return_value TSRMLS_CC);`
`3768`	`3768`	`tzobj = (php_timezone_obj *) zend_object_store_get_object(return_value TSRMLS_CC);`
`3769`	`3769`	`if(php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht TSRMLS_CC) != SUCCESS) {`
`3770`		`- php_error_docref(NULL, E_ERROR, "Timezone initialization failed");`
	`3770`	`+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Timezone initialization failed");`
`3771`	`3771`	`}`
`3772`	`3772`	`}`
`3773`	`3773`	`/* }}} */`
`@@ -3785,7 +3785,7 @@ PHP_METHOD(DateTimeZone, __wakeup)`
`3785`	`3785`	`myht = Z_OBJPROP_P(object);`
`3786`	`3786`
`3787`	`3787`	`if(php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht TSRMLS_CC) != SUCCESS) {`
`3788`		`- php_error_docref(NULL, E_ERROR, "Timezone initialization failed");`
	`3788`	`+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Timezone initialization failed");`
`3789`	`3789`	`}`
`3790`	`3790`	`}`
`3791`	`3791`	`/* }}} */`