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/skeleton/php_skeleton.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/skeleton/php_skeleton.h')
| -rw-r--r-- | ext/skeleton/php_skeleton.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ext/skeleton/php_skeleton.h b/ext/skeleton/php_skeleton.h index d79ca491a7..1514563a70 100644 --- a/ext/skeleton/php_skeleton.h +++ b/ext/skeleton/php_skeleton.h @@ -34,14 +34,10 @@ ZEND_END_MODULE_GLOBALS(extname) You are encouraged to rename these macros something shorter, see examples in any other php module directory. */ +#define EXTNAME_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(extname, v) -#ifdef ZTS -#define EXTNAME_G(v) ZEND_TSRMG(extname_globals_id, zend_extname_globals *, v) -#ifdef COMPILE_DL_EXTNAME -ZEND_TSRMLS_CACHE_EXTERN(); -#endif -#else -#define EXTNAME_G(v) (extname_globals.v) +#if defined(ZTS) && defined(COMPILE_DL_EXTNAME) +ZEND_TSRMLS_CACHE_EXTERN() #endif #endif /* PHP_EXTNAME_H */ |