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/skeleton.c | |
| 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/skeleton.c')
| -rw-r--r-- | ext/skeleton/skeleton.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ext/skeleton/skeleton.c b/ext/skeleton/skeleton.c index 5103ba82fc..d432f1c3df 100644 --- a/ext/skeleton/skeleton.c +++ b/ext/skeleton/skeleton.c @@ -39,7 +39,7 @@ PHP_FUNCTION(confirm_extname_compiled) size_t arg_len, len; char *strg; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg, &arg_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &arg, &arg_len) == FAILURE) { return; } @@ -95,6 +95,9 @@ PHP_MSHUTDOWN_FUNCTION(extname) */ PHP_RINIT_FUNCTION(extname) { +#if defined(COMPILE_DL_EXTNAME) && defined(ZTS) + ZEND_TSRMLS_CACHE_UPDATE; +#endif return SUCCESS; } /* }}} */ @@ -150,6 +153,9 @@ zend_module_entry extname_module_entry = { /* }}} */ #ifdef COMPILE_DL_EXTNAME +#ifdef ZTS +ZEND_TSRMLS_CACHE_DEFINE; +#endif ZEND_GET_MODULE(extname) #endif |