diff options
Diffstat (limited to 'ext/sqlite3/php_sqlite3.h')
| -rw-r--r-- | ext/sqlite3/php_sqlite3.h | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/ext/sqlite3/php_sqlite3.h b/ext/sqlite3/php_sqlite3.h index 693f17eb64..ca09e341ab 100644 --- a/ext/sqlite3/php_sqlite3.h +++ b/ext/sqlite3/php_sqlite3.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) 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 | @@ -29,25 +29,15 @@ ZEND_BEGIN_MODULE_GLOBALS(sqlite3) int dbconfig_defensive; ZEND_END_MODULE_GLOBALS(sqlite3) -#ifdef ZTS -# define SQLITE3G(v) TSRMG(sqlite3_globals_id, zend_sqlite3_globals *, v) -# ifdef COMPILE_DL_SQLITE3 +#if defined(ZTS) && defined(COMPILE_DL_SQLITE3) ZEND_TSRMLS_CACHE_EXTERN() -# endif -#else -# define SQLITE3G(v) (sqlite3_globals.v) #endif +ZEND_EXTERN_MODULE_GLOBALS(sqlite3) +#define SQLITE3G(v) ZEND_MODULE_GLOBALS_ACCESSOR(sqlite3, v) + #define PHP_SQLITE3_ASSOC 1<<0 #define PHP_SQLITE3_NUM 1<<1 #define PHP_SQLITE3_BOTH (PHP_SQLITE3_ASSOC|PHP_SQLITE3_NUM) #endif - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * indent-tabs-mode: t - * End: - */ |