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/com_dotnet/php_com_dotnet.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/com_dotnet/php_com_dotnet.h')
| -rw-r--r-- | ext/com_dotnet/php_com_dotnet.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/ext/com_dotnet/php_com_dotnet.h b/ext/com_dotnet/php_com_dotnet.h index 8ac6e039b6..640f5db08f 100644 --- a/ext/com_dotnet/php_com_dotnet.h +++ b/ext/com_dotnet/php_com_dotnet.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 | @@ -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 -ZEND_TSRMLS_CACHE_EXTERN(); -# endif -#else -# define COMG(v) (com_dotnet_globals.v) +#if defined(ZTS) && defined(COMPILE_DL_COM_DOTNET) +ZEND_TSRMLS_CACHE_EXTERN() #endif extern ZEND_DECLARE_MODULE_GLOBALS(com_dotnet); +#define COMG(v) ZEND_MODULE_GLOBALS_ACCESSOR(com_dotnet, v) #endif /* PHP_COM_DOTNET_H */ |