diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-03-12 14:15:47 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-03-12 14:15:47 +0300 |
| commit | f1b306fe117cfbbe69ab4ef9713d39ea068e74c0 (patch) | |
| tree | 876485fc86d30924b161cd623919ddfc11a5c69a /ext/dba/dba.c | |
| parent | 5aa1176238f41097ea7295ba6911aa19ae7c1021 (diff) | |
| download | php-git-f1b306fe117cfbbe69ab4ef9713d39ea068e74c0.tar.gz | |
Switch to use ZTS cache
Diffstat (limited to 'ext/dba/dba.c')
| -rw-r--r-- | ext/dba/dba.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 5e163066f3..ede12f0bd6 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -160,11 +160,7 @@ ZEND_END_MODULE_GLOBALS(dba) ZEND_DECLARE_MODULE_GLOBALS(dba) -#ifdef ZTS -#define DBA_G(v) TSRMG(dba_globals_id, zend_dba_globals *, v) -#else -#define DBA_G(v) (dba_globals.v) -#endif +#define DBA_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(dba, v) static PHP_GINIT_FUNCTION(dba); @@ -186,6 +182,9 @@ zend_module_entry dba_module_entry = { }; #ifdef COMPILE_DL_DBA +#ifdef ZTS +ZEND_TSRMLS_CACHE_DEFINE() +#endif ZEND_GET_MODULE(dba) #endif @@ -515,6 +514,9 @@ PHP_INI_END() */ static PHP_GINIT_FUNCTION(dba) { +#if defined(COMPILE_DL_DBA) && defined(ZTS) + ZEND_TSRMLS_CACHE_UPDATE(); +#endif dba_globals->default_handler = ""; dba_globals->default_hptr = NULL; } |