diff options
| author | Anatol Belski <ab@php.net> | 2015-07-29 12:26:23 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-07-29 13:26:35 +0200 |
| commit | 4e66cce87ce0e57a7394486412e61abcfc5f3520 (patch) | |
| tree | 74da7597406fcb73d654f193d139c063b3c7093e /ext/mysqli/php_mysqli_structs.h | |
| parent | 0615aa82d74f91efa4a5a7bcee1b9718fa03f15c (diff) | |
| download | php-git-4e66cce87ce0e57a7394486412e61abcfc5f3520.tar.gz | |
switch to the unified globals accessor where appropriate
Diffstat (limited to 'ext/mysqli/php_mysqli_structs.h')
| -rw-r--r-- | ext/mysqli/php_mysqli_structs.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index 5d4bb049f8..9f0dc419bf 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -342,15 +342,11 @@ 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 +#if defined(ZTS) && defined(COMPILE_DL_MYSQLI) ZEND_TSRMLS_CACHE_EXTERN(); #endif -#else -#define MyG(v) (mysqli_globals.v) -#endif #define my_estrdup(x) (x) ? estrdup(x) : NULL #define my_efree(x) if (x) efree(x) |