diff options
| author | Xinchen Hui <laruence@php.net> | 2015-03-09 17:23:34 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-03-09 17:23:34 +0800 |
| commit | 64bbc98dffda056f3e8fcca12ad48aa8f0294389 (patch) | |
| tree | a9b19e8bc33695f9652ed5a003fbd9feb5d89c75 /ext/mysqli/php_mysqli_structs.h | |
| parent | eed341980256a6ed7904d9fa64cec56bcbcd642d (diff) | |
| parent | 4ca14f681e2eebbbb232b7a3f662ed05038d779f (diff) | |
| download | php-git-64bbc98dffda056f3e8fcca12ad48aa8f0294389.tar.gz | |
Merge branch 'PHP-5.6'
Conflicts:
ext/mysqli/php_mysqli_structs.h
Diffstat (limited to 'ext/mysqli/php_mysqli_structs.h')
| -rw-r--r-- | ext/mysqli/php_mysqli_structs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index ec9ef49e91..055765197d 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -314,7 +314,6 @@ extern PHPAPI zend_class_entry *spl_ce_RuntimeException; mysqli_object *intern = Z_MYSQLI_P(__id); \ efree(intern->ptr); \ intern->ptr = NULL; \ - ZVAL_NULL(__id); \ } |