diff options
author | Xinchen Hui <laruence@php.net> | 2015-03-09 17:23:04 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@php.net> | 2015-03-09 17:23:04 +0800 |
commit | 4ca14f681e2eebbbb232b7a3f662ed05038d779f (patch) | |
tree | 207cce788f6a2a92b186e69f3e8003b9d55ec56f /ext/mysqli/php_mysqli_structs.h | |
parent | 711ee5e4e1243f083660adf590ecff4de4a791a6 (diff) | |
parent | 9af1383a3f9835db99e9b68eb9bcb6a0f341e339 (diff) | |
download | php-git-4ca14f681e2eebbbb232b7a3f662ed05038d779f.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
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 e6dafea58c..d061bfb21a 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -313,7 +313,6 @@ extern PHPAPI zend_class_entry *spl_ce_RuntimeException; mysqli_object *intern = (mysqli_object *)zend_object_store_get_object(*(__id) TSRMLS_CC);\ efree(intern->ptr); \ intern->ptr = NULL; \ - ZVAL_NULL(*__id); \ } |