diff options
| author | Aaron Piotrowski <aaron@trowski.com> | 2016-06-10 22:02:23 -0500 |
|---|---|---|
| committer | Aaron Piotrowski <aaron@trowski.com> | 2016-06-10 22:02:23 -0500 |
| commit | e3c681aa5cc71122a8d2fae42e6513fc413ccac8 (patch) | |
| tree | 5f1df62f7b666028edb0ee1adf083a52d63df45a /ext/mysqli/php_mysqli_structs.h | |
| parent | fb4e3085cbaa76eb8f28eebf848a81d1c0190067 (diff) | |
| parent | 792e89385ca6fc722a03590722eb7745a2374720 (diff) | |
| download | php-git-e3c681aa5cc71122a8d2fae42e6513fc413ccac8.tar.gz | |
Merge branch 'master' into throw-error-in-extensions
Diffstat (limited to 'ext/mysqli/php_mysqli_structs.h')
| -rw-r--r-- | ext/mysqli/php_mysqli_structs.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index 5d4bb049f8..c75023c3ad 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -216,10 +216,6 @@ extern zend_object_iterator *php_mysqli_result_get_iterator(zend_class_entry *ce extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, zend_long fetchtype); -#ifdef HAVE_SPL -extern PHPAPI zend_class_entry *spl_ce_RuntimeException; -#endif - #define MYSQLI_DISABLE_MQ if (mysql->multi_query) { \ mysql_set_server_option(mysql->mysql, MYSQL_OPTION_MULTI_STATEMENTS_OFF); \ mysql->multi_query = 0; \ @@ -342,14 +338,10 @@ ZEND_BEGIN_MODULE_GLOBALS(mysqli) zend_bool rollback_on_cached_plink; ZEND_END_MODULE_GLOBALS(mysqli) +#define MyG(v) ZEND_MODULE_GLOBALS_ACCESSOR(mysqli, v) -#ifdef ZTS -#define MyG(v) ZEND_TSRMG(mysqli_globals_id, zend_mysqli_globals *, v) -#ifdef COMPILE_DL_MYSQLI -ZEND_TSRMLS_CACHE_EXTERN(); -#endif -#else -#define MyG(v) (mysqli_globals.v) +#if defined(ZTS) && defined(COMPILE_DL_MYSQLI) +ZEND_TSRMLS_CACHE_EXTERN() #endif #define my_estrdup(x) (x) ? estrdup(x) : NULL |