archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE

Browse source 
Also re bug #71575.
This commit is contained in:
Nikita Popov 2016-03-03 16:46:04 +01:00
parent c4b188871e
commit 1ac152938c
62 changed files with 63 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TSRM/TSRM.h
View file

@ -170,8 +170,8 @@ TSRM_API void *tsrm_get_ls_cache(void);
#define TSRMG_STATIC(id, type, element) (TSRMG_BULK_STATIC(id, type)->element) #define TSRMG_STATIC(id, type, element) (TSRMG_BULK_STATIC(id, type)->element)
#define TSRMG_BULK_STATIC(id, type) ((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)]) #define TSRMG_BULK_STATIC(id, type) ((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])
#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE #define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE;
#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL #define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL;
#if ZEND_DEBUG #if ZEND_DEBUG
#define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache() #define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache()
#else #else

2
TSRM/tsrm_win32.h
View file

@ -72,7 +72,7 @@ typedef struct {
#ifdef ZTS #ifdef ZTS
# define TWG(v) TSRMG_STATIC(win32_globals_id, tsrm_win32_globals *, v) # define TWG(v) TSRMG_STATIC(win32_globals_id, tsrm_win32_globals *, v)
TSRMLS_CACHE_EXTERN(); TSRMLS_CACHE_EXTERN()
#else #else
# define TWG(v) (win32_globals.v) # define TWG(v) (win32_globals.v)
#endif #endif

2
Zend/zend.c
View file

@ -148,7 +148,7 @@ static HashTable *global_class_table = NULL;
static HashTable *global_constants_table = NULL; static HashTable *global_constants_table = NULL;
static HashTable *global_auto_globals_table = NULL; static HashTable *global_auto_globals_table = NULL;
static HashTable *global_persistent_list = NULL; static HashTable *global_persistent_list = NULL;
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_API zend_utility_values zend_uv; ZEND_API zend_utility_values zend_uv;

2
Zend/zend.h
View file

@ -77,7 +77,7 @@
#define ZEND_TSRMLS_CACHE #define ZEND_TSRMLS_CACHE
#endif #endif
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#ifdef HAVE_NORETURN #ifdef HAVE_NORETURN
# ifdef ZEND_NORETURN_ALIAS # ifdef ZEND_NORETURN_ALIAS

2
ext/bcmath/bcmath.c
View file

@ -128,7 +128,7 @@ zend_module_entry bcmath_module_entry = {
#ifdef COMPILE_DL_BCMATH #ifdef COMPILE_DL_BCMATH
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(bcmath) ZEND_GET_MODULE(bcmath)
#endif #endif

2
ext/bcmath/php_bcmath.h
View file

@ -52,7 +52,7 @@ ZEND_BEGIN_MODULE_GLOBALS(bcmath)
ZEND_END_MODULE_GLOBALS(bcmath) ZEND_END_MODULE_GLOBALS(bcmath)
#if defined(ZTS) && defined(COMPILE_DL_BCMATH) #if defined(ZTS) && defined(COMPILE_DL_BCMATH)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif
ZEND_EXTERN_MODULE_GLOBALS(bcmath) ZEND_EXTERN_MODULE_GLOBALS(bcmath)

2
ext/com_dotnet/com_extension.c
View file

@ -255,7 +255,7 @@ zend_module_entry com_dotnet_module_entry = {
#ifdef COMPILE_DL_COM_DOTNET #ifdef COMPILE_DL_COM_DOTNET
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(com_dotnet) ZEND_GET_MODULE(com_dotnet)
#endif #endif

2
ext/com_dotnet/php_com_dotnet.h
View file

@ -56,7 +56,7 @@ ZEND_BEGIN_MODULE_GLOBALS(com_dotnet)
ZEND_END_MODULE_GLOBALS(com_dotnet) ZEND_END_MODULE_GLOBALS(com_dotnet)
#if defined(ZTS) && defined(COMPILE_DL_COM_DOTNET) #if defined(ZTS) && defined(COMPILE_DL_COM_DOTNET)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif
extern ZEND_DECLARE_MODULE_GLOBALS(com_dotnet); extern ZEND_DECLARE_MODULE_GLOBALS(com_dotnet);

2
ext/exif/exif.c
View file

@ -155,7 +155,7 @@ ZEND_DECLARE_MODULE_GLOBALS(exif)
#define EXIF_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(exif, v) #define EXIF_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(exif, v)
#if defined(ZTS) && defined(COMPILE_DL_EXIF) #if defined(ZTS) && defined(COMPILE_DL_EXIF)
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
/* {{{ PHP_INI /* {{{ PHP_INI

2
ext/filter/filter.c
View file

@ -152,7 +152,7 @@ zend_module_entry filter_module_entry = {
#ifdef COMPILE_DL_FILTER #ifdef COMPILE_DL_FILTER
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(filter) ZEND_GET_MODULE(filter)
#endif #endif

2
ext/filter/php_filter.h
View file

@ -66,7 +66,7 @@ ZEND_BEGIN_MODULE_GLOBALS(filter)
ZEND_END_MODULE_GLOBALS(filter) ZEND_END_MODULE_GLOBALS(filter)
#if defined(COMPILE_DL_FILTER) && defined(ZTS) #if defined(COMPILE_DL_FILTER) && defined(ZTS)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif
#define IF_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(filter, v) #define IF_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(filter, v)

2
ext/gmp/gmp.c
View file

@ -215,7 +215,7 @@ zend_module_entry gmp_module_entry = {
#ifdef COMPILE_DL_GMP #ifdef COMPILE_DL_GMP
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(gmp) ZEND_GET_MODULE(gmp)
#endif #endif

2
ext/gmp/php_gmp.h
View file

@ -98,7 +98,7 @@ ZEND_END_MODULE_GLOBALS(gmp)
#define GMPG(v) ZEND_MODULE_GLOBALS_ACCESSOR(gmp, v) #define GMPG(v) ZEND_MODULE_GLOBALS_ACCESSOR(gmp, v)
#if defined(ZTS) && defined(COMPILE_DL_GMP) #if defined(ZTS) && defined(COMPILE_DL_GMP)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif
#else #else

2
ext/iconv/iconv.c
View file

@ -165,7 +165,7 @@ zend_module_entry iconv_module_entry = {
#ifdef COMPILE_DL_ICONV #ifdef COMPILE_DL_ICONV
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(iconv) ZEND_GET_MODULE(iconv)
#endif #endif

2
ext/iconv/php_iconv.h
View file

@ -78,7 +78,7 @@ ZEND_END_MODULE_GLOBALS(iconv)
#define ICONVG(v) ZEND_MODULE_GLOBALS_ACCESSOR(iconv, v) #define ICONVG(v) ZEND_MODULE_GLOBALS_ACCESSOR(iconv, v)
#if defined(ZTS) && defined(COMPILE_DL_ICONV) #if defined(ZTS) && defined(COMPILE_DL_ICONV)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif
#ifdef HAVE_IBM_ICONV #ifdef HAVE_IBM_ICONV

2
ext/interbase/interbase.c
View file

@ -461,7 +461,7 @@ zend_module_entry ibase_module_entry = {
#ifdef COMPILE_DL_INTERBASE #ifdef COMPILE_DL_INTERBASE
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(ibase) ZEND_GET_MODULE(ibase)
#endif #endif

2
ext/interbase/php_ibase_includes.h
View file

@ -130,7 +130,7 @@ enum php_interbase_option {
#define IBG(v) ZEND_MODULE_GLOBALS_ACCESSOR(ibase, v) #define IBG(v) ZEND_MODULE_GLOBALS_ACCESSOR(ibase, v)
#if defined(ZTS) && defined(COMPILE_DL_INTERBASE) #if defined(ZTS) && defined(COMPILE_DL_INTERBASE)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif
#define BLOB_ID_LEN 18 #define BLOB_ID_LEN 18

2
ext/intl/php_intl.c
View file

@ -892,7 +892,7 @@ zend_module_entry intl_module_entry = {
#ifdef COMPILE_DL_INTL #ifdef COMPILE_DL_INTL
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE( intl ) ZEND_GET_MODULE( intl )
#endif #endif

2
ext/intl/php_intl.h
View file

@ -56,7 +56,7 @@ ZEND_BEGIN_MODULE_GLOBALS(intl)
ZEND_END_MODULE_GLOBALS(intl) ZEND_END_MODULE_GLOBALS(intl)
#if defined(ZTS) && defined(COMPILE_DL_INTL) #if defined(ZTS) && defined(COMPILE_DL_INTL)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif
ZEND_EXTERN_MODULE_GLOBALS(intl) ZEND_EXTERN_MODULE_GLOBALS(intl)

2
ext/json/json.c
View file

@ -175,7 +175,7 @@ zend_module_entry json_module_entry = {
#ifdef COMPILE_DL_JSON #ifdef COMPILE_DL_JSON
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(json) ZEND_GET_MODULE(json)
#endif #endif

2
ext/json/php_json.h
View file

@ -89,7 +89,7 @@ PHP_JSON_API ZEND_EXTERN_MODULE_GLOBALS(json)
#define JSON_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(json, v) #define JSON_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(json, v)
#if defined(ZTS) && defined(COMPILE_DL_JSON) #if defined(ZTS) && defined(COMPILE_DL_JSON)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif
PHP_JSON_API void php_json_encode(smart_str *buf, zval *val, int options); PHP_JSON_API void php_json_encode(smart_str *buf, zval *val, int options);

2
ext/libxml/libxml.c
View file

@ -80,7 +80,7 @@ static zend_class_entry *libxmlerror_class_entry;
/* {{{ dynamically loadable module stuff */ /* {{{ dynamically loadable module stuff */
#ifdef COMPILE_DL_LIBXML #ifdef COMPILE_DL_LIBXML
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(libxml) ZEND_GET_MODULE(libxml)
#endif /* COMPILE_DL_LIBXML */ #endif /* COMPILE_DL_LIBXML */

2
ext/libxml/php_libxml.h
View file

@ -118,7 +118,7 @@ PHP_LIBXML_API void php_libxml_shutdown(void);
#define LIBXML(v) ZEND_MODULE_GLOBALS_ACCESSOR(libxml, v) #define LIBXML(v) ZEND_MODULE_GLOBALS_ACCESSOR(libxml, v)
#if defined(ZTS) && defined(COMPILE_DL_LIBXML) #if defined(ZTS) && defined(COMPILE_DL_LIBXML)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif
#else /* HAVE_LIBXML */ #else /* HAVE_LIBXML */

2
ext/mbstring/mbstring.c
View file

@ -591,7 +591,7 @@ static sapi_post_entry php_post_entries[] = {
#ifdef COMPILE_DL_MBSTRING #ifdef COMPILE_DL_MBSTRING
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(mbstring) ZEND_GET_MODULE(mbstring)
#endif #endif

2
ext/mbstring/mbstring.h
View file

@ -205,7 +205,7 @@ struct mb_overload_def {
#define MBSTRG(v) ZEND_MODULE_GLOBALS_ACCESSOR(mbstring, v) #define MBSTRG(v) ZEND_MODULE_GLOBALS_ACCESSOR(mbstring, v)
#if defined(ZTS) && defined(COMPILE_DL_MBSTRING) #if defined(ZTS) && defined(COMPILE_DL_MBSTRING)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif
#else /* HAVE_MBSTRING */ #else /* HAVE_MBSTRING */

2
ext/mcrypt/mcrypt.c
View file

@ -273,7 +273,7 @@ zend_module_entry mcrypt_module_entry = {
#ifdef COMPILE_DL_MCRYPT #ifdef COMPILE_DL_MCRYPT
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(mcrypt) ZEND_GET_MODULE(mcrypt)
#endif #endif

2
ext/mysqli/mysqli.c
View file

@ -1031,7 +1031,7 @@ zend_module_entry mysqli_module_entry = {
#ifdef COMPILE_DL_MYSQLI #ifdef COMPILE_DL_MYSQLI
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(mysqli) ZEND_GET_MODULE(mysqli)
#endif #endif

2
ext/mysqli/php_mysqli_structs.h
View file

@ -345,7 +345,7 @@ ZEND_END_MODULE_GLOBALS(mysqli)
#define MyG(v) ZEND_MODULE_GLOBALS_ACCESSOR(mysqli, v) #define MyG(v) ZEND_MODULE_GLOBALS_ACCESSOR(mysqli, v)
#if defined(ZTS) && defined(COMPILE_DL_MYSQLI) #if defined(ZTS) && defined(COMPILE_DL_MYSQLI)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif
#define my_estrdup(x) (x) ? estrdup(x) : NULL #define my_estrdup(x) (x) ? estrdup(x) : NULL

2
ext/mysqlnd/mysqlnd.h
View file

@ -284,7 +284,7 @@ PHPAPI ZEND_EXTERN_MODULE_GLOBALS(mysqlnd)
#define MYSQLND_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(mysqlnd, v) #define MYSQLND_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(mysqlnd, v)
#if defined(ZTS) && defined(COMPILE_DL_MYSQLND) #if defined(ZTS) && defined(COMPILE_DL_MYSQLND)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif

2
ext/mysqlnd/php_mysqlnd.c
View file

@ -361,7 +361,7 @@ zend_module_entry mysqlnd_module_entry = {
/* {{{ COMPILE_DL_MYSQLND */ /* {{{ COMPILE_DL_MYSQLND */
#ifdef COMPILE_DL_MYSQLND #ifdef COMPILE_DL_MYSQLND
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(mysqlnd) ZEND_GET_MODULE(mysqlnd)
#endif #endif

2
ext/odbc/php_odbc.c
View file

@ -412,7 +412,7 @@ zend_module_entry odbc_module_entry = {
#ifdef COMPILE_DL_ODBC #ifdef COMPILE_DL_ODBC
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(odbc) ZEND_GET_MODULE(odbc)
#endif #endif

2
ext/odbc/php_odbc_includes.h
View file

@ -308,7 +308,7 @@ PHP_ODBC_API ZEND_EXTERN_MODULE_GLOBALS(odbc)
#define ODBCG(v) ZEND_MODULE_GLOBALS_ACCESSOR(odbc, v) #define ODBCG(v) ZEND_MODULE_GLOBALS_ACCESSOR(odbc, v)
#if defined(ZTS) && defined(COMPILE_DL_ODBC) #if defined(ZTS) && defined(COMPILE_DL_ODBC)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif
#endif /* HAVE_UODBC */ #endif /* HAVE_UODBC */

2
ext/opcache/ZendAccelerator.c
View file

@ -97,7 +97,7 @@ zend_accel_globals accel_globals;
#else #else
int accel_globals_id; int accel_globals_id;
#if defined(COMPILE_DL_OPCACHE) #if defined(COMPILE_DL_OPCACHE)
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
#endif #endif

2
ext/opcache/ZendAccelerator.h
View file

@ -308,7 +308,7 @@ extern zend_accel_shared_globals *accel_shared_globals;
# define ZCG(v) ZEND_TSRMG(accel_globals_id, zend_accel_globals *, v) # define ZCG(v) ZEND_TSRMG(accel_globals_id, zend_accel_globals *, v)
extern int accel_globals_id; extern int accel_globals_id;
# ifdef COMPILE_DL_OPCACHE # ifdef COMPILE_DL_OPCACHE
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
# endif # endif
#else #else
# define ZCG(v) (accel_globals.v) # define ZCG(v) (accel_globals.v)

2
ext/pdo_mysql/pdo_mysql.c
View file

@ -33,7 +33,7 @@
#ifdef COMPILE_DL_PDO_MYSQL #ifdef COMPILE_DL_PDO_MYSQL
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(pdo_mysql) ZEND_GET_MODULE(pdo_mysql)
#endif #endif

2
ext/pdo_mysql/php_pdo_mysql_int.h
View file

@ -89,7 +89,7 @@ ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql)
#define PDO_MYSQL_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(pdo_mysql, v) #define PDO_MYSQL_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(pdo_mysql, v)
#if defined(ZTS) && defined(COMPILE_DL_PDO_MYSQL) #if defined(ZTS) && defined(COMPILE_DL_PDO_MYSQL)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif

2
ext/pgsql/pgsql.c
View file

@ -773,7 +773,7 @@ zend_module_entry pgsql_module_entry = {
#ifdef COMPILE_DL_PGSQL #ifdef COMPILE_DL_PGSQL
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(pgsql) ZEND_GET_MODULE(pgsql)
#endif #endif

2
ext/pgsql/php_pgsql.h
View file

@ -326,7 +326,7 @@ ZEND_EXTERN_MODULE_GLOBALS(pgsql)
# define PGG(v) ZEND_MODULE_GLOBALS_ACCESSOR(pgsql, v) # define PGG(v) ZEND_MODULE_GLOBALS_ACCESSOR(pgsql, v)
#if defined(ZTS) && defined(COMPILE_DL_PGSQL) #if defined(ZTS) && defined(COMPILE_DL_PGSQL)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif
#endif #endif

2
ext/phar/phar.c
View file

@ -3229,7 +3229,7 @@ int phar_flush(phar_archive_data *phar, char *user_stub, zend_long len, int conv
#ifdef COMPILE_DL_PHAR #ifdef COMPILE_DL_PHAR
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(phar) ZEND_GET_MODULE(phar)
#endif #endif

2
ext/phar/phar_internal.h
View file

@ -198,7 +198,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phar)
#define PHAR_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(phar, v) #define PHAR_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(phar, v)
#if defined(ZTS) && defined(COMPILE_DL_PHAR) #if defined(ZTS) && defined(COMPILE_DL_PHAR)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif
#ifndef php_uint16 #ifndef php_uint16

2
ext/session/php_session.h
View file

@ -220,7 +220,7 @@ extern zend_module_entry session_module_entry;
#ifdef ZTS #ifdef ZTS
#define PS(v) ZEND_TSRMG(ps_globals_id, php_ps_globals *, v) #define PS(v) ZEND_TSRMG(ps_globals_id, php_ps_globals *, v)
#ifdef COMPILE_DL_SESSION #ifdef COMPILE_DL_SESSION
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif
#else #else
#define PS(v) (ps_globals.v) #define PS(v) (ps_globals.v)

2
ext/session/session.c
View file

@ -3099,7 +3099,7 @@ zend_module_entry session_module_entry = {
#ifdef COMPILE_DL_SESSION #ifdef COMPILE_DL_SESSION
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(session) ZEND_GET_MODULE(session)
#endif #endif

2
ext/skeleton/php_skeleton.h
View file

@ -37,7 +37,7 @@ ZEND_END_MODULE_GLOBALS(extname)
#define EXTNAME_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(extname, v) #define EXTNAME_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(extname, v)
#if defined(ZTS) && defined(COMPILE_DL_EXTNAME) #if defined(ZTS) && defined(COMPILE_DL_EXTNAME)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif
#endif /* PHP_EXTNAME_H */ #endif /* PHP_EXTNAME_H */

2
ext/skeleton/skeleton.c
View file

@ -153,7 +153,7 @@ zend_module_entry extname_module_entry = {
#ifdef COMPILE_DL_EXTNAME #ifdef COMPILE_DL_EXTNAME
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(extname) ZEND_GET_MODULE(extname)
#endif #endif

2
ext/soap/php_soap.h
View file

@ -192,7 +192,7 @@ ZEND_EXTERN_MODULE_GLOBALS(soap)
#define SOAP_GLOBAL(v) ZEND_MODULE_GLOBALS_ACCESSOR(soap, v) #define SOAP_GLOBAL(v) ZEND_MODULE_GLOBALS_ACCESSOR(soap, v)
#if defined(ZTS) && defined(COMPILE_DL_SOAP) #if defined(ZTS) && defined(COMPILE_DL_SOAP)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif
extern zend_class_entry* soap_var_class_entry; extern zend_class_entry* soap_var_class_entry;

2
ext/soap/soap.c
View file

@ -467,7 +467,7 @@ zend_module_entry soap_module_entry = {
#ifdef COMPILE_DL_SOAP #ifdef COMPILE_DL_SOAP
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(soap) ZEND_GET_MODULE(soap)
#endif #endif

2
ext/sockets/sockets.c
View file

@ -371,7 +371,7 @@ zend_module_entry sockets_module_entry = {
#ifdef COMPILE_DL_SOCKETS #ifdef COMPILE_DL_SOCKETS
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(sockets) ZEND_GET_MODULE(sockets)
#endif #endif

2
ext/sqlite3/php_sqlite3.h
View file

@ -33,7 +33,7 @@ ZEND_END_MODULE_GLOBALS(sqlite3)
#ifdef ZTS #ifdef ZTS
# define SQLITE3G(v) TSRMG(sqlite3_globals_id, zend_sqlite3_globals *, v) # define SQLITE3G(v) TSRMG(sqlite3_globals_id, zend_sqlite3_globals *, v)
# ifdef COMPILE_DL_SQLITE3 # ifdef COMPILE_DL_SQLITE3
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
# endif # endif
#else #else
# define SQLITE3G(v) (sqlite3_globals.v) # define SQLITE3G(v) (sqlite3_globals.v)

2
ext/sqlite3/sqlite3.c
View file

@ -2314,7 +2314,7 @@ zend_module_entry sqlite3_module_entry = {
#ifdef COMPILE_DL_SQLITE3 #ifdef COMPILE_DL_SQLITE3
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(sqlite3) ZEND_GET_MODULE(sqlite3)
#endif #endif

2
ext/tidy/php_tidy.h
View file

@ -45,7 +45,7 @@ ZEND_END_MODULE_GLOBALS(tidy)
#define TG(v) ZEND_MODULE_GLOBALS_ACCESSOR(tidy, v) #define TG(v) ZEND_MODULE_GLOBALS_ACCESSOR(tidy, v)
#if defined(ZTS) && defined(COMPILE_DL_TIDY) #if defined(ZTS) && defined(COMPILE_DL_TIDY)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif
#endif #endif

2
ext/tidy/tidy.c
View file

@ -466,7 +466,7 @@ zend_module_entry tidy_module_entry = {
#ifdef COMPILE_DL_TIDY #ifdef COMPILE_DL_TIDY
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(tidy) ZEND_GET_MODULE(tidy)
#endif #endif

2
ext/xml/php_xml.h
View file

@ -147,7 +147,7 @@ PHP_XML_API zend_string *xml_utf8_encode(const char *, size_t, const XML_Char *)
#define XML(v) ZEND_MODULE_GLOBALS_ACCESSOR(xml, v) #define XML(v) ZEND_MODULE_GLOBALS_ACCESSOR(xml, v)
#if defined(ZTS) && defined(COMPILE_DL_XML) #if defined(ZTS) && defined(COMPILE_DL_XML)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif
#endif /* PHP_XML_H */ #endif /* PHP_XML_H */

2
ext/xml/xml.c
View file

@ -63,7 +63,7 @@ ZEND_DECLARE_MODULE_GLOBALS(xml)
/* {{{ dynamically loadable module stuff */ /* {{{ dynamically loadable module stuff */
#ifdef COMPILE_DL_XML #ifdef COMPILE_DL_XML
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(xml) ZEND_GET_MODULE(xml)
#endif /* COMPILE_DL_XML */ #endif /* COMPILE_DL_XML */

2
ext/zlib/zlib.c
View file

@ -1187,7 +1187,7 @@ PHP_FUNCTION(deflate_add)
#ifdef COMPILE_DL_ZLIB #ifdef COMPILE_DL_ZLIB
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_GET_MODULE(php_zlib) ZEND_GET_MODULE(php_zlib)
#endif #endif

2
sapi/apache2handler/php_apache.h
View file

@ -80,7 +80,7 @@ extern zend_module_entry apache2_module_entry;
#ifdef ZTS #ifdef ZTS
extern int php_apache2_info_id; extern int php_apache2_info_id;
#define AP2(v) ZEND_TSRMG(php_apache2_info_id, php_apache2_info_struct *, v) #define AP2(v) ZEND_TSRMG(php_apache2_info_id, php_apache2_info_struct *, v)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#else #else
extern php_apache2_info_struct php_apache2_info; extern php_apache2_info_struct php_apache2_info;
#define AP2(v) (php_apache2_info.v) #define AP2(v) (php_apache2_info.v)

2
sapi/apache2handler/sapi_apache2.c
View file

@ -66,7 +66,7 @@
/* A way to specify the location of the php.ini dir in an apache directive */ /* A way to specify the location of the php.ini dir in an apache directive */
char *apache2_php_ini_path_override = NULL; char *apache2_php_ini_path_override = NULL;
#if defined(PHP_WIN32) && defined(ZTS) #if defined(PHP_WIN32) && defined(ZTS)
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
static size_t static size_t

2
sapi/cgi/cgi_main.c
View file

@ -202,7 +202,7 @@ static void user_config_cache_entry_dtor(zval *el)
static int php_cgi_globals_id; static int php_cgi_globals_id;
#define CGIG(v) ZEND_TSRMG(php_cgi_globals_id, php_cgi_globals_struct *, v) #define CGIG(v) ZEND_TSRMG(php_cgi_globals_id, php_cgi_globals_struct *, v)
#if defined(PHP_WIN32) #if defined(PHP_WIN32)
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
#else #else
static php_cgi_globals_struct php_cgi_globals; static php_cgi_globals_struct php_cgi_globals;

2
sapi/cli/php_cli.c
View file

@ -103,7 +103,7 @@ PHPAPI extern char *php_ini_scanned_path;
PHPAPI extern char *php_ini_scanned_files; PHPAPI extern char *php_ini_scanned_files;
#if defined(PHP_WIN32) && defined(ZTS) #if defined(PHP_WIN32) && defined(ZTS)
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
#ifndef O_BINARY #ifndef O_BINARY

2
sapi/cli/php_cli_server.h
View file

@ -33,7 +33,7 @@ ZEND_END_MODULE_GLOBALS(cli_server)
#ifdef ZTS #ifdef ZTS
#define CLI_SERVER_G(v) ZEND_TSRMG(cli_server_globals_id, zend_cli_server_globals *, v) #define CLI_SERVER_G(v) ZEND_TSRMG(cli_server_globals_id, zend_cli_server_globals *, v)
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#else #else
#define CLI_SERVER_G(v) (cli_server_globals.v) #define CLI_SERVER_G(v) (cli_server_globals.v)
#endif #endif

2
sapi/embed/php_embed.c
View file

@ -34,7 +34,7 @@ const char HARDCODED_INI[] =
"max_input_time=-1\n\0"; "max_input_time=-1\n\0";
#if defined(PHP_WIN32) && defined(ZTS) #if defined(PHP_WIN32) && defined(ZTS)
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
static char* php_embed_read_cookies(void) static char* php_embed_read_cookies(void)

2
sapi/embed/php_embed.h
View file

@ -45,7 +45,7 @@
#endif #endif
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_EXTERN(); ZEND_TSRMLS_CACHE_EXTERN()
#endif #endif
BEGIN_EXTERN_C() BEGIN_EXTERN_C()

2
sapi/phpdbg/phpdbg.c
View file

@ -53,7 +53,7 @@
#endif #endif
#if defined(PHP_WIN32) && defined(ZTS) #if defined(PHP_WIN32) && defined(ZTS)
ZEND_TSRMLS_CACHE_DEFINE(); ZEND_TSRMLS_CACHE_DEFINE()
#endif #endif
ZEND_DECLARE_MODULE_GLOBALS(phpdbg); ZEND_DECLARE_MODULE_GLOBALS(phpdbg);