Merge branch 'PHP-7.0'

laruence · laruence · commit 2dd32fe489eb · 2015-10-12T10:44:45.000+08:00
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
@@ -492,7 +492,6 @@ ZEND_API void ZEND_FASTCALL convert_to_boolean(zval *op) /* {{{ */
 
 ZEND_API void ZEND_FASTCALL _convert_to_cstring(zval *op ZEND_FILE_LINE_DC) /* {{{ */
 {
-	double dval;
 	if (Z_TYPE_P(op) == IS_DOUBLE) {
 		zend_string *str;
 		double dval = Z_DVAL_P(op);

Original file line number	Diff line number	Diff line change
`@@ -492,7 +492,6 @@ ZEND_API void ZEND_FASTCALL convert_to_boolean(zval op) / {{{ */`
`492`	`492`
`493`	`493`	`ZEND_API void ZEND_FASTCALL _convert_to_cstring(zval op ZEND_FILE_LINE_DC) / {{{ */`
`494`	`494`	`{`
`495`		`- double dval;`
`496`	`495`	`if (Z_TYPE_P(op) == IS_DOUBLE) {`
`497`	`496`	`zend_string *str;`
`498`	`497`	`double dval = Z_DVAL_P(op);`