diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /ext/skeleton/php_skeleton.h | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'ext/skeleton/php_skeleton.h')
| -rw-r--r-- | ext/skeleton/php_skeleton.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/ext/skeleton/php_skeleton.h b/ext/skeleton/php_skeleton.h index bf73bfcc9b..3d23493b68 100644 --- a/ext/skeleton/php_skeleton.h +++ b/ext/skeleton/php_skeleton.h @@ -30,18 +30,16 @@ ZEND_BEGIN_MODULE_GLOBALS(extname) ZEND_END_MODULE_GLOBALS(extname) */ -/* In every utility function you add that needs to use variables - in php_extname_globals, call TSRMLS_FETCH(); after declaring other - variables used by that function, or better yet, pass in TSRMLS_CC - after the last function argument and declare your utility function - with TSRMLS_DC after the last declared argument. Always refer to - the globals in your function as EXTNAME_G(variable). You are - encouraged to rename these macros something shorter, see +/* Always refer to the globals in your function as EXTNAME_G(variable). + You are encouraged to rename these macros something shorter, see examples in any other php module directory. */ #ifdef ZTS -#define EXTNAME_G(v) TSRMG(extname_globals_id, zend_extname_globals *, v) +#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) #endif |