Merge branch 'PHP-5.5'

This commit is contained in:
Xinchen Hui 2013-01-15 10:41:07 +08:00
commit a744390c50

View File

@ -584,7 +584,7 @@ ZEND_API void _convert_to_cstring(zval *op ZEND_FILE_LINE_DC) /* {{{ */
break;
}
default:
return _convert_to_string(op);
_convert_to_string(op ZEND_FILE_LINE_CC);
}
Z_TYPE_P(op) = IS_STRING;
}