php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 06:51:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0'

Browse Source 
* PHP-7.0:
  Superfluous semicolon
This commit is contained in:
Xinchen Hui
2015-12-24 10:42:49 +08:00
parent 349927934d c2fa01b939
commit 5b916d3dd5
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Zend/zend_dtrace.c
View File

@@ -112,5 +112,6 @@ ZEND_API void dtrace_execute_internal(zend_execute_data *execute_data, zval *ret
}
/* }}} */
#endif /* HAVE_DTRACE */

2
ext/spl/spl_array.c
View File

@@ -277,7 +277,7 @@ static zval *spl_array_get_dimension_ptr(int check_inherited, zval *object, zval
if ((type == BP_VAR_W || type == BP_VAR_RW) && (ht->u.v.nApplyCount > 0)) {
zend_error(E_WARNING, "Modification of ArrayObject during sorting is prohibited");
return &EG(error_zval);;
return &EG(error_zval);
}
try_again: