diff options
Diffstat (limited to 'ext/imap/php_imap.h')
| -rw-r--r-- | ext/imap/php_imap.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ext/imap/php_imap.h b/ext/imap/php_imap.h index 6e5cfdb31c..c23799976c 100644 --- a/ext/imap/php_imap.h +++ b/ext/imap/php_imap.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) 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 | @@ -232,12 +232,13 @@ ZEND_BEGIN_MODULE_GLOBALS(imap) zend_bool enable_rsh; ZEND_END_MODULE_GLOBALS(imap) -#ifdef ZTS -# define IMAPG(v) TSRMG(imap_globals_id, zend_imap_globals *, v) -#else -# define IMAPG(v) (imap_globals.v) +#if defined(ZTS) && defined(COMPILE_DL_IMAP) +ZEND_TSRMLS_CACHE_EXTERN() #endif +ZEND_EXTERN_MODULE_GLOBALS(imap) +#define IMAPG(v) ZEND_MODULE_GLOBALS_ACCESSOR(imap, v) + #else #define imap_module_ptr NULL |