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/com_dotnet | |
| parent | 0615aa82d74f91efa4a5a7bcee1b9718fa03f15c (diff) | |
| download | php-git-4e66cce87ce0e57a7394486412e61abcfc5f3520.tar.gz | |
switch to the unified globals accessor where appropriate
Diffstat (limited to 'ext/com_dotnet')
| -rw-r--r-- | ext/com_dotnet/php_com_dotnet.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ext/com_dotnet/php_com_dotnet.h b/ext/com_dotnet/php_com_dotnet.h index 8ac6e039b6..ed35f28963 100644 --- a/ext/com_dotnet/php_com_dotnet.h +++ b/ext/com_dotnet/php_com_dotnet.h @@ -55,16 +55,12 @@ ZEND_BEGIN_MODULE_GLOBALS(com_dotnet) zend_bool rshutdown_started; ZEND_END_MODULE_GLOBALS(com_dotnet) -#ifdef ZTS -# define COMG(v) ZEND_TSRMG(com_dotnet_globals_id, zend_com_dotnet_globals *, v) -# ifdef COMPILE_DL_COM_DOTNET +#if defined(ZTS) && defined(COMPILE_DL_COM_DOTNET) ZEND_TSRMLS_CACHE_EXTERN(); -# endif -#else -# define COMG(v) (com_dotnet_globals.v) #endif extern ZEND_DECLARE_MODULE_GLOBALS(com_dotnet); +#define COMG(v) ZEND_MODULE_GLOBALS_ACCESSOR(com_dotnet, v) #endif /* PHP_COM_DOTNET_H */ |