#define TSRMG(id, type, element) (((type) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)
#define TSRMG_STATIC(id, type, element) (((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)
-#define TSRMLS_CACHE_EXTERN extern TSRM_TLS void *TSRMLS_CACHE
-#define TSRMLS_CACHE_DEFINE TSRM_TLS void *TSRMLS_CACHE = NULL
-#define TSRMLS_CACHE_UPDATE if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache()
+#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE
+#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL
+#define TSRMLS_CACHE_UPDATE() if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache()
#define TSRMLS_CACHE _tsrm_ls_cache
/* BC only */
#define TSRMLS_SET_CTX(ctx)
#define TSRMG_STATIC(id, type, element)
-#define TSRMLS_CACHE_EXTERN
-#define TSRMLS_CACHE_DEFINE
-#define TSRMLS_CACHE_UPDATE
+#define TSRMLS_CACHE_EXTERN()
+#define TSRMLS_CACHE_DEFINE()
+#define TSRMLS_CACHE_UPDATE()
#define TSRMLS_CACHE
/* BC only */
static void tsrm_win32_ctor(tsrm_win32_globals *globals)
{
#ifdef ZTS
-TSRMLS_CACHE_UPDATE;
+TSRMLS_CACHE_UPDATE();
#endif
globals->process = NULL;
globals->shm = NULL;
#ifdef ZTS
# define TWG(v) TSRMG_STATIC(win32_globals_id, tsrm_win32_globals *, v)
-TSRMLS_CACHE_EXTERN;
+TSRMLS_CACHE_EXTERN();
#else
# define TWG(v) (win32_globals.v)
#endif
static HashTable *global_constants_table = NULL;
static HashTable *global_auto_globals_table = NULL;
static HashTable *global_persistent_list = NULL;
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_API zend_utility_values zend_uv;
static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{{ */
{
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
zend_startup_constants();
zend_copy_constants(EG(zend_constants), GLOBAL_CONSTANTS_TABLE);
zend_init_rsrc_plist();
zend_executor_globals *executor_globals;
extern ZEND_API ts_rsrc_id ini_scanner_globals_id;
extern ZEND_API ts_rsrc_id language_scanner_globals_id;
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#else
extern zend_ini_scanner_globals ini_scanner_globals;
extern zend_php_scanner_globals language_scanner_globals;
#ifdef ZEND_ENABLE_STATIC_TSRMLS_CACHE
#define ZEND_TSRMG TSRMG_STATIC
-#define ZEND_TSRMLS_CACHE_EXTERN TSRMLS_CACHE_EXTERN
-#define ZEND_TSRMLS_CACHE_DEFINE TSRMLS_CACHE_DEFINE
-#define ZEND_TSRMLS_CACHE_UPDATE TSRMLS_CACHE_UPDATE
+#define ZEND_TSRMLS_CACHE_EXTERN() TSRMLS_CACHE_EXTERN()
+#define ZEND_TSRMLS_CACHE_DEFINE() TSRMLS_CACHE_DEFINE()
+#define ZEND_TSRMLS_CACHE_UPDATE() TSRMLS_CACHE_UPDATE()
#define ZEND_TSRMLS_CACHE TSRMLS_CACHE
#else
#define ZEND_TSRMG TSRMG
-#define ZEND_TSRMLS_CACHE_EXTERN
-#define ZEND_TSRMLS_CACHE_DEFINE
-#define ZEND_TSRMLS_CACHE_UPDATE
+#define ZEND_TSRMLS_CACHE_EXTERN()
+#define ZEND_TSRMLS_CACHE_DEFINE()
+#define ZEND_TSRMLS_CACHE_UPDATE()
#define ZEND_TSRMLS_CACHE
#endif
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
#ifdef HAVE_NORETURN
# ifdef ZEND_NORETRUN_ALIAS
return;
}
#endif
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
alloc_globals->mm_heap = zend_mm_init();
}
#ifdef COMPILE_DL_BCMATH
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(bcmath)
#endif
static PHP_GINIT_FUNCTION(bcmath)
{
#if defined(COMPILE_DL_BCMATH) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
bcmath_globals->bc_precision = 0;
bc_init_numbers();
#ifdef ZTS
# define BCG(v) ZEND_TSRMG(bcmath_globals_id, zend_bcmath_globals *, v)
# ifdef COMPILE_DL_BCMATH
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
# endif
#else
# define BCG(v) (bcmath_globals.v)
#ifdef COMPILE_DL_COM_DOTNET
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(com_dotnet)
#endif
static PHP_GINIT_FUNCTION(com_dotnet)
{
#if defined(COMPILE_DL_COM_DOTNET) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
memset(com_dotnet_globals, 0, sizeof(*com_dotnet_globals));
com_dotnet_globals->code_page = CP_ACP;
#ifdef ZTS
# define COMG(v) ZEND_TSRMG(com_dotnet_globals_id, zend_com_dotnet_globals *, v)
# ifdef COMPILE_DL_COM_DOTNET
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
# endif
#else
# define COMG(v) (com_dotnet_globals.v)
#ifdef ZTS
#define EXIF_G(v) ZEND_TSRMG(exif_globals_id, zend_exif_globals *, v)
#ifdef COMPILE_DL_EXIF
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
#else
#define EXIF_G(v) (exif_globals.v)
static PHP_GINIT_FUNCTION(exif)
{
#if defined(COMPILE_DL_EXIF) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
exif_globals->encode_unicode = NULL;
exif_globals->decode_unicode_be = NULL;
#ifdef COMPILE_DL_FILTER
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(filter)
#endif
static void php_filter_init_globals(zend_filter_globals *filter_globals) /* {{{ */
{
#if defined(COMPILE_DL_FILTER) && defined(ZTS)
-ZEND_TSRMLS_CACHE_UPDATE;
+ZEND_TSRMLS_CACHE_UPDATE();
#endif
ZVAL_UNDEF(&filter_globals->post_array);
ZVAL_UNDEF(&filter_globals->get_array);
#ifdef ZTS
#define IF_G(v) ZEND_TSRMG(filter_globals_id, zend_filter_globals *, v)
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
#else
#define IF_G(v) (filter_globals.v)
#endif
#ifdef COMPILE_DL_GMP
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(gmp)
#endif
static ZEND_GINIT_FUNCTION(gmp)
{
#if defined(COMPILE_DL_GMP) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
gmp_globals->rand_initialized = 0;
}
#ifdef ZTS
#define GMPG(v) ZEND_TSRMG(gmp_globals_id, zend_gmp_globals *, v)
#ifdef COMPILE_DL_GMP
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
#endif
#else
#define GMPG(v) (gmp_globals.v)
#ifdef COMPILE_DL_ICONV
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(iconv)
#endif
static PHP_GINIT_FUNCTION(iconv)
{
#if defined(COMPILE_DL_ICONV) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
iconv_globals->input_encoding = NULL;
iconv_globals->output_encoding = NULL;
#ifdef ZTS
# define ICONVG(v) ZEND_TSRMG(iconv_globals_id, zend_iconv_globals *, v)
# ifdef COMPILE_DL_ICONV
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
# endif
#else
# define ICONVG(v) (iconv_globals.v)
#ifdef ZTS
# define IBG(v) ZEND_TSRMG(ibase_globals_id, zend_ibase_globals *, v)
# ifdef COMPILE_DL_INTERBASE
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
# endif
#else
#define IBG(v) (ibase_globals.v)
#ifdef COMPILE_DL_INTL
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE( intl )
#endif
static PHP_GINIT_FUNCTION(intl)
{
#if defined(COMPILE_DL_INTL) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
memset( intl_globals, 0, sizeof(zend_intl_globals) );
}
#ifdef ZTS
#define INTL_G(v) ZEND_TSRMG(intl_globals_id, zend_intl_globals *, v)
#ifdef COMPILE_DL_INTL
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
#endif
#else
#define INTL_G(v) (intl_globals.v)
static PHP_GINIT_FUNCTION(json)
{
#if defined(COMPILE_DL_JSON) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
json_globals->encoder_depth = 0;
json_globals->error_code = 0;
#ifdef COMPILE_DL_JSON
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(json)
#endif
/* {{{ dynamically loadable module stuff */
#ifdef COMPILE_DL_LIBXML
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(libxml)
#endif /* COMPILE_DL_LIBXML */
static PHP_GINIT_FUNCTION(libxml)
{
#if defined(COMPILE_DL_LIBXML) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
ZVAL_UNDEF(&libxml_globals->stream_context);
libxml_globals->error_buffer.s = NULL;
#ifdef ZTS
#define LIBXML(v) ZEND_TSRMG(libxml_globals_id, zend_libxml_globals *, v)
#ifdef COMPILE_DL_LIBXML
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
#endif
#else
#define LIBXML(v) (libxml_globals.v)
#ifdef COMPILE_DL_MBSTRING
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(mbstring)
#endif
static PHP_GINIT_FUNCTION(mbstring)
{
#if defined(COMPILE_DL_MBSTRING) && defined(ZTS)
-ZEND_TSRMLS_CACHE_UPDATE;
+ZEND_TSRMLS_CACHE_UPDATE();
#endif
mbstring_globals->language = mbfl_no_language_uni;
#ifdef ZTS
#define MBSTRG(v) ZEND_TSRMG(mbstring_globals_id, zend_mbstring_globals *, v)
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
#else
#define MBSTRG(v) (mbstring_globals.v)
#endif
#ifdef COMPILE_DL_MYSQL
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(mysql)
#endif
static PHP_GINIT_FUNCTION(mysql)
{
#if defined(COMPILE_DL_MYSQL) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
mysql_globals->num_persistent = 0;
mysql_globals->default_socket = NULL;
#ifdef ZTS
# define MySG(v) ZEND_TSRMG(mysql_globals_id, zend_mysql_globals *, v)
# ifdef COMPILE_DL_MYSQL
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
# endif
#else
# define MySG(v) (mysql_globals.v)
static PHP_GINIT_FUNCTION(mysqli)
{
#if defined(COMPILE_DL_MYSQLI) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
mysqli_globals->num_links = 0;
mysqli_globals->num_active_persistent = 0;
#ifdef COMPILE_DL_MYSQLI
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(mysqli)
#endif
#ifdef ZTS
#define MyG(v) ZEND_TSRMG(mysqli_globals_id, zend_mysqli_globals *, v)
#ifdef COMPILE_DL_MYSQLI
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
#endif
#else
#define MyG(v) (mysqli_globals.v)
#ifdef ZTS
#define MYSQLND_G(v) ZEND_TSRMG(mysqlnd_globals_id, zend_mysqlnd_globals *, v)
#ifdef COMPILE_DL_MYSQLND
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
#endif
#else
#define MYSQLND_G(v) (mysqlnd_globals.v)
static PHP_GINIT_FUNCTION(mysqlnd)
{
#if defined(COMPILE_DL_MYSQLND) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
mysqlnd_globals->collect_statistics = TRUE;
mysqlnd_globals->collect_memory_statistics = FALSE;
/* {{{ COMPILE_DL_MYSQLND */
#ifdef COMPILE_DL_MYSQLND
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(mysqlnd)
#endif
#else
int accel_globals_id;
#if defined(COMPILE_DL_OPCACHE)
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
#endif
static void accel_globals_ctor(zend_accel_globals *accel_globals)
{
#if defined(COMPILE_DL_OPCACHE) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
memset(accel_globals, 0, sizeof(zend_accel_globals));
zend_hash_init(&accel_globals->function_table, zend_hash_num_elements(CG(function_table)), NULL, ZEND_FUNCTION_DTOR, 1);
# define ZCG(v) ZEND_TSRMG(accel_globals_id, zend_accel_globals *, v)
extern int accel_globals_id;
# ifdef COMPILE_DL_OPCACHE
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
# endif
#else
# define ZCG(v) (accel_globals.v)
#ifdef COMPILE_DL_PDO_MYSQL
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(pdo_mysql)
#endif
static PHP_GINIT_FUNCTION(pdo_mysql)
{
#if defined(COMPILE_DL_PDO_MYSQL) && defined(ZTS)
-ZEND_TSRMLS_CACHE_UPDATE;
+ZEND_TSRMLS_CACHE_UPDATE();
#endif
#ifndef PHP_WIN32
pdo_mysql_globals->default_socket = NULL;
#ifdef ZTS
#define PDO_MYSQL_G(v) ZEND_TSRMG(pdo_mysql_globals_id, zend_pdo_mysql_globals *, v)
# ifdef COMPILE_DL_PDO_MYSQL
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
# endif
#else
#define PDO_MYSQL_G(v) (pdo_mysql_globals.v)
#ifdef COMPILE_DL_PGSQL
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(pgsql)
#endif
static PHP_GINIT_FUNCTION(pgsql)
{
#if defined(COMPILE_DL_PGSQL) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
memset(pgsql_globals, 0, sizeof(zend_pgsql_globals));
/* Initilize notice message hash at MINIT only */
#ifdef ZTS
# define PGG(v) ZEND_TSRMG(pgsql_globals_id, zend_pgsql_globals *, v)
# ifdef COMPILE_DL_PGSQL
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
# endif
#else
# define PGG(v) (pgsql_globals.v)
#ifdef COMPILE_DL_PHAR
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(phar)
#endif
PHP_GINIT_FUNCTION(phar) /* {{{ */
{
#if defined(COMPILE_DL_PHAR) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
phar_mime_type mime;
#ifdef ZTS
# include "TSRM.h"
# ifdef COMPILE_DL_PHAR
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
# endif
# define PHAR_G(v) ZEND_TSRMG(phar_globals_id, zend_phar_globals *, v)
# define PHAR_GLOBALS ((zend_phar_globals *) (*((void ***) ZEND_TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(phar_globals_id)])
#ifdef ZTS
#define PS(v) ZEND_TSRMG(ps_globals_id, php_ps_globals *, v)
#ifdef COMPILE_DL_SESSION
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
#endif
#else
#define PS(v) (ps_globals.v)
int i;
#if defined(COMPILE_DL_SESSION) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
ps_globals->save_path = NULL;
#ifdef COMPILE_DL_SESSION
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(session)
#endif
#ifdef ZTS
#define EXTNAME_G(v) ZEND_TSRMG(extname_globals_id, zend_extname_globals *, v)
#ifdef COMPILE_DL_EXTNAME
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
#endif
#else
#define EXTNAME_G(v) (extname_globals.v)
PHP_RINIT_FUNCTION(extname)
{
#if defined(COMPILE_DL_EXTNAME) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
return SUCCESS;
}
#ifdef COMPILE_DL_EXTNAME
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(extname)
#endif
#ifdef ZTS
# define SOAP_GLOBAL(v) ZEND_TSRMG(soap_globals_id, zend_soap_globals *, v)
# ifdef COMPILE_DL_SOAP
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
# endif
#else
# define SOAP_GLOBAL(v) (soap_globals.v)
#ifdef COMPILE_DL_SOAP
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(soap)
#endif
PHP_RINIT_FUNCTION(soap)
{
#if defined(COMPILE_DL_SOAP) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
SOAP_GLOBAL(typemap) = NULL;
SOAP_GLOBAL(use_soap_error_handler) = 0;
zend_class_entry ce;
#if defined(COMPILE_DL_SOAP) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
/* TODO: add ini entry for always use soap errors */
php_soap_prepare_globals();
#ifdef COMPILE_DL_SOCKETS
#ifdef ZTS
- ZEND_TSRMLS_CACHE_DEFINE;
+ ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(sockets)
#endif
static PHP_GINIT_FUNCTION(sockets)
{
#if defined(COMPILE_DL_SOCKETS) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
sockets_globals->last_error = 0;
sockets_globals->strerror_buf = NULL;
static PHP_MINIT_FUNCTION(sockets)
{
#if defined(COMPILE_DL_SOCKETS) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
le_socket = zend_register_list_destructors_ex(php_destroy_socket, NULL, le_socket_name, module_number);
#ifdef ZTS
# define SQLITE3G(v) TSRMG(sqlite3_globals_id, zend_sqlite3_globals *, v)
# ifdef COMPILE_DL_SQLITE3
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
# endif
#else
# define SQLITE3G(v) (sqlite3_globals.v)
static PHP_GINIT_FUNCTION(sqlite3)
{
#if defined(COMPILE_DL_SQLITE3) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
memset(sqlite3_globals, 0, sizeof(*sqlite3_globals));
}
#ifdef COMPILE_DL_SQLITE3
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(sqlite3)
#endif
#ifdef ZTS
#define TG(v) ZEND_TSRMG(tidy_globals_id, zend_tidy_globals *, v)
#ifdef COMPILE_DL_TIDY
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
#endif
#else
#define TG(v) (tidy_globals.v)
#ifdef COMPILE_DL_TIDY
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(tidy)
#endif
static PHP_RINIT_FUNCTION(tidy)
{
#if defined(COMPILE_DL_TIDY) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
php_tidy_clean_output_start(ZEND_STRL("ob_tidyhandler"));
#ifdef ZTS
#define XML(v) ZEND_TSRMG(xml_globals_id, zend_xml_globals *, v)
#ifdef COMPILE_DL_XML
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
#endif
#else
#define XML(v) (xml_globals.v)
/* {{{ dynamically loadable module stuff */
#ifdef COMPILE_DL_XML
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(xml)
#endif /* COMPILE_DL_XML */
static PHP_GINIT_FUNCTION(xml)
{
#if defined(COMPILE_DL_XML) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
xml_globals->default_encoding = (XML_Char*)"UTF-8";
}
#ifdef COMPILE_DL_ZLIB
#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
ZEND_GET_MODULE(php_zlib)
#endif
static PHP_GINIT_FUNCTION(zlib)
{
#if defined(COMPILE_DL_ZLIB) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
zlib_globals->ob_gzhandler = NULL;
zlib_globals->handler_registered = 0;
static void sapi_globals_ctor(sapi_globals_struct *sapi_globals)
{
#ifdef ZTS
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
memset(sapi_globals, 0, sizeof(*sapi_globals));
zend_hash_init_ex(&sapi_globals->known_post_content_types, 8, NULL, _type_dtor, 1, 0);
* Initialize the module globals on MINIT */
static inline void php_output_init_globals(zend_output_globals *G)
{
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
memset(G, 0, sizeof(*G));
}
/* }}} */
#ifdef ZTS
extern int php_apache2_info_id;
#define AP2(v) ZEND_TSRMG(php_apache2_info_id, php_apache2_info_struct *, v)
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
#else
extern php_apache2_info_struct php_apache2_info;
#define AP2(v) (php_apache2_info.v)
/* A way to specify the location of the php.ini dir in an apache directive */
char *apache2_php_ini_path_override = NULL;
#if defined(PHP_WIN32) && defined(ZTS)
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
static size_t
#ifdef ZTS
tsrm_startup(1, 1, 0, NULL);
(void)ts_resource(0);
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
sapi_startup(&apache2_sapi_module);
apache2_sapi_module.startup(&apache2_sapi_module);
#ifdef ZTS
/* initial resource fetch */
(void)ts_resource(0);
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
#define PHPAP_INI_OFF php_apache_ini_dtor(r, parent_req);
static int php_cgi_globals_id;
#define CGIG(v) ZEND_TSRMG(php_cgi_globals_id, php_cgi_globals_struct *, v)
#if defined(PHP_WIN32)
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
#else
static php_cgi_globals_struct php_cgi_globals;
static void php_cgi_globals_ctor(php_cgi_globals_struct *php_cgi_globals)
{
#ifdef ZTS
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
php_cgi_globals->rfc2616_headers = 0;
php_cgi_globals->nph = 0;
#ifdef ZTS
tsrm_startup(1, 1, 0, NULL);
tsrm_ls = ts_resource(0);
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
sapi_startup(&cgi_sapi_module);
PHPAPI extern char *php_ini_scanned_files;
#if defined(PHP_WIN32) && defined(ZTS)
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
#ifndef O_BINARY
#ifdef ZTS
tsrm_startup(1, 1, 0, NULL);
(void)ts_resource(0);
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
#ifdef PHP_WIN32
static int php_cli_server_request_ctor(php_cli_server_request *req) /* {{{ */
{
#ifdef ZTS
-ZEND_TSRMLS_CACHE_UPDATE;
+ZEND_TSRMLS_CACHE_UPDATE();
#endif
req->protocol_version = 0;
req->request_uri = NULL;
#ifdef ZTS
#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
#define CLI_SERVER_G(v) (cli_server_globals.v)
#endif
"max_input_time=-1\n\0";
#if defined(PHP_WIN32) && defined(ZTS)
-ZEND_TSRMLS_CACHE_DEFINE;
+ZEND_TSRMLS_CACHE_DEFINE();
#endif
static char* php_embed_read_cookies(void)
#ifdef ZTS
tsrm_startup(1, 1, 0, NULL);
(void)ts_resource(0);
- ZEND_TSRMLS_CACHE_UPDATE;
+ ZEND_TSRMLS_CACHE_UPDATE();
#endif
sapi_startup(&php_embed_module);
#endif
#ifdef ZTS
-ZEND_TSRMLS_CACHE_EXTERN;
+ZEND_TSRMLS_CACHE_EXTERN();
#endif
BEGIN_EXTERN_C()