diff options
Diffstat (limited to 'ext')
47 files changed, 74 insertions, 74 deletions
diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c index 31f6537614..14586f6cf3 100644 --- a/ext/bcmath/bcmath.c +++ b/ext/bcmath/bcmath.c @@ -128,7 +128,7 @@ zend_module_entry bcmath_module_entry = { #ifdef COMPILE_DL_BCMATH #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE(bcmath) #endif @@ -144,7 +144,7 @@ PHP_INI_END() 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(); diff --git a/ext/bcmath/php_bcmath.h b/ext/bcmath/php_bcmath.h index 864737c4d0..eab199f5fc 100644 --- a/ext/bcmath/php_bcmath.h +++ b/ext/bcmath/php_bcmath.h @@ -51,7 +51,7 @@ ZEND_END_MODULE_GLOBALS(bcmath) #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) diff --git a/ext/com_dotnet/com_extension.c b/ext/com_dotnet/com_extension.c index fbc6ee0a20..fcd1eff9c5 100644 --- a/ext/com_dotnet/com_extension.c +++ b/ext/com_dotnet/com_extension.c @@ -255,7 +255,7 @@ zend_module_entry com_dotnet_module_entry = { #ifdef COMPILE_DL_COM_DOTNET #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE(com_dotnet) #endif @@ -341,7 +341,7 @@ PHP_INI_END() 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; diff --git a/ext/com_dotnet/php_com_dotnet.h b/ext/com_dotnet/php_com_dotnet.h index cc19d386bd..85ab9b827e 100644 --- a/ext/com_dotnet/php_com_dotnet.h +++ b/ext/com_dotnet/php_com_dotnet.h @@ -55,7 +55,7 @@ ZEND_END_MODULE_GLOBALS(com_dotnet) #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) diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 0e25a05cf2..8bdc0c8f27 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -158,7 +158,7 @@ ZEND_DECLARE_MODULE_GLOBALS(exif) #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) @@ -212,7 +212,7 @@ PHP_INI_END() 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; diff --git a/ext/filter/filter.c b/ext/filter/filter.c index 9e2613257e..107ba86374 100644 --- a/ext/filter/filter.c +++ b/ext/filter/filter.c @@ -154,7 +154,7 @@ zend_module_entry filter_module_entry = { #ifdef COMPILE_DL_FILTER #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE(filter) #endif @@ -196,7 +196,7 @@ PHP_INI_END() 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); diff --git a/ext/filter/php_filter.h b/ext/filter/php_filter.h index 6cac462f3c..87f469bafe 100644 --- a/ext/filter/php_filter.h +++ b/ext/filter/php_filter.h @@ -65,7 +65,7 @@ ZEND_END_MODULE_GLOBALS(filter) #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 diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c index a64da90745..4d8e4c9bc6 100644 --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@ -215,7 +215,7 @@ zend_module_entry gmp_module_entry = { #ifdef COMPILE_DL_GMP #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE(gmp) #endif @@ -630,7 +630,7 @@ exit: 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; } diff --git a/ext/gmp/php_gmp.h b/ext/gmp/php_gmp.h index bba228a838..ca3f404d68 100644 --- a/ext/gmp/php_gmp.h +++ b/ext/gmp/php_gmp.h @@ -95,7 +95,7 @@ ZEND_END_MODULE_GLOBALS(gmp) #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) diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index b9fb10bdec..e723f6e2eb 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -165,7 +165,7 @@ zend_module_entry iconv_module_entry = { #ifdef COMPILE_DL_ICONV #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE(iconv) #endif @@ -174,7 +174,7 @@ ZEND_GET_MODULE(iconv) 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; diff --git a/ext/iconv/php_iconv.h b/ext/iconv/php_iconv.h index f2bb7c3fa1..527f497a6a 100644 --- a/ext/iconv/php_iconv.h +++ b/ext/iconv/php_iconv.h @@ -75,7 +75,7 @@ ZEND_END_MODULE_GLOBALS(iconv) #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) diff --git a/ext/interbase/php_ibase_includes.h b/ext/interbase/php_ibase_includes.h index 99f3366f50..ab63a14842 100644 --- a/ext/interbase/php_ibase_includes.h +++ b/ext/interbase/php_ibase_includes.h @@ -134,7 +134,7 @@ enum php_interbase_option { #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) diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c index aef6dc15c7..8b05b58d2a 100644 --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c @@ -895,7 +895,7 @@ zend_module_entry intl_module_entry = { #ifdef COMPILE_DL_INTL #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE( intl ) #endif @@ -904,7 +904,7 @@ ZEND_GET_MODULE( intl ) 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) ); } diff --git a/ext/intl/php_intl.h b/ext/intl/php_intl.h index 822ea02183..b15d336bc3 100644 --- a/ext/intl/php_intl.h +++ b/ext/intl/php_intl.h @@ -58,7 +58,7 @@ ZEND_END_MODULE_GLOBALS(intl) #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) diff --git a/ext/json/json.c b/ext/json/json.c index b40cb695d7..1caef65013 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -134,7 +134,7 @@ static PHP_MINIT_FUNCTION(json) 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; @@ -165,7 +165,7 @@ zend_module_entry json_module_entry = { #ifdef COMPILE_DL_JSON #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE(json) #endif diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c index e8e84fc7a5..0eee3ff2bd 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -80,7 +80,7 @@ static zend_class_entry *libxmlerror_class_entry; /* {{{ 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 */ @@ -272,7 +272,7 @@ static void php_libxml_node_free_list(xmlNodePtr node) 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; diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h index 2212056c46..39a140c516 100644 --- a/ext/libxml/php_libxml.h +++ b/ext/libxml/php_libxml.h @@ -115,7 +115,7 @@ PHP_LIBXML_API void php_libxml_shutdown(void); #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) diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 504a5e697f..20bca129ff 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -598,7 +598,7 @@ static sapi_post_entry php_post_entries[] = { #ifdef COMPILE_DL_MBSTRING #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE(mbstring) #endif @@ -1495,7 +1495,7 @@ PHP_INI_END() 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; diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h index 1b5956d73e..9685c64d7b 100644 --- a/ext/mbstring/mbstring.h +++ b/ext/mbstring/mbstring.h @@ -201,7 +201,7 @@ struct mb_overload_def { #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 diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 02852566ab..1275c9a576 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -353,7 +353,7 @@ zend_module_entry mysql_module_entry = { #ifdef COMPILE_DL_MYSQL #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE(mysql) #endif @@ -516,7 +516,7 @@ PHP_INI_END() 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; diff --git a/ext/mysql/php_mysql_structs.h b/ext/mysql/php_mysql_structs.h index 59b3b595c9..e1c9326008 100644 --- a/ext/mysql/php_mysql_structs.h +++ b/ext/mysql/php_mysql_structs.h @@ -129,7 +129,7 @@ ZEND_END_MODULE_GLOBALS(mysql) #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) diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 9be31960c5..f72a38b294 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -537,7 +537,7 @@ PHP_INI_END() 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; @@ -1032,7 +1032,7 @@ zend_module_entry mysqli_module_entry = { #ifdef COMPILE_DL_MYSQLI #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE(mysqli) #endif diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index 43cc5cd606..055765197d 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -346,7 +346,7 @@ ZEND_END_MODULE_GLOBALS(mysqli) #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) diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h index 99256a8d95..44f48b4b72 100644 --- a/ext/mysqlnd/mysqlnd.h +++ b/ext/mysqlnd/mysqlnd.h @@ -290,7 +290,7 @@ PHPAPI ZEND_EXTERN_MODULE_GLOBALS(mysqlnd) #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) diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c index c24aa48f8c..bf5cb36007 100644 --- a/ext/mysqlnd/php_mysqlnd.c +++ b/ext/mysqlnd/php_mysqlnd.c @@ -180,7 +180,7 @@ PHPAPI ZEND_DECLARE_MODULE_GLOBALS(mysqlnd) 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; @@ -361,7 +361,7 @@ zend_module_entry mysqlnd_module_entry = { /* {{{ COMPILE_DL_MYSQLND */ #ifdef COMPILE_DL_MYSQLND #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE(mysqlnd) #endif diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 4823609ca1..350bd209eb 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -91,7 +91,7 @@ zend_accel_globals accel_globals; #else int accel_globals_id; #if defined(COMPILE_DL_OPCACHE) -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif #endif @@ -2236,7 +2236,7 @@ static int zend_accel_init_shm(void) 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); diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h index 369f609ecf..71e38c9f29 100644 --- a/ext/opcache/ZendAccelerator.h +++ b/ext/opcache/ZendAccelerator.h @@ -288,7 +288,7 @@ extern zend_accel_shared_globals *accel_shared_globals; # 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) diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c index f767aff2f7..701137a2a5 100644 --- a/ext/pdo_mysql/pdo_mysql.c +++ b/ext/pdo_mysql/pdo_mysql.c @@ -33,7 +33,7 @@ #ifdef COMPILE_DL_PDO_MYSQL #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE(pdo_mysql) #endif @@ -210,7 +210,7 @@ static PHP_RSHUTDOWN_FUNCTION(pdo_mysql) 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; diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h index 5f4dd3b0c6..17bace7882 100644 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h @@ -85,7 +85,7 @@ ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql) #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) diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index e27bd22eca..f0e4532237 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -773,7 +773,7 @@ zend_module_entry pgsql_module_entry = { #ifdef COMPILE_DL_PGSQL #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE(pgsql) #endif @@ -1093,7 +1093,7 @@ PHP_INI_END() 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 */ diff --git a/ext/pgsql/php_pgsql.h b/ext/pgsql/php_pgsql.h index cde0154a72..3e5fcbe851 100644 --- a/ext/pgsql/php_pgsql.h +++ b/ext/pgsql/php_pgsql.h @@ -324,7 +324,7 @@ ZEND_EXTERN_MODULE_GLOBALS(pgsql) #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) diff --git a/ext/phar/phar.c b/ext/phar/phar.c index 0eda67e66a..cba275c30a 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -3226,7 +3226,7 @@ int phar_flush(phar_archive_data *phar, char *user_stub, zend_long len, int conv #ifdef COMPILE_DL_PHAR #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE(phar) #endif @@ -3337,7 +3337,7 @@ static void mime_type_dtor(zval *zv) PHP_GINIT_FUNCTION(phar) /* {{{ */ { #if defined(COMPILE_DL_PHAR) && defined(ZTS) - ZEND_TSRMLS_CACHE_UPDATE; + ZEND_TSRMLS_CACHE_UPDATE(); #endif phar_mime_type mime; diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h index 0029a181e8..0f8323f065 100644 --- a/ext/phar/phar_internal.h +++ b/ext/phar/phar_internal.h @@ -197,7 +197,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phar) #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)]) diff --git a/ext/session/php_session.h b/ext/session/php_session.h index 972a39cefc..8e61928cc7 100644 --- a/ext/session/php_session.h +++ b/ext/session/php_session.h @@ -217,7 +217,7 @@ extern zend_module_entry session_module_entry; #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) diff --git a/ext/session/session.c b/ext/session/session.c index 782618dff7..6afdc73757 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -2584,7 +2584,7 @@ static PHP_GINIT_FUNCTION(ps) /* {{{ */ int i; #if defined(COMPILE_DL_SESSION) && defined(ZTS) - ZEND_TSRMLS_CACHE_UPDATE; + ZEND_TSRMLS_CACHE_UPDATE(); #endif ps_globals->save_path = NULL; @@ -3023,7 +3023,7 @@ zend_module_entry session_module_entry = { #ifdef COMPILE_DL_SESSION #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE(session) #endif diff --git a/ext/skeleton/php_skeleton.h b/ext/skeleton/php_skeleton.h index 593d3a665b..d79ca491a7 100644 --- a/ext/skeleton/php_skeleton.h +++ b/ext/skeleton/php_skeleton.h @@ -38,7 +38,7 @@ ZEND_END_MODULE_GLOBALS(extname) #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) diff --git a/ext/skeleton/skeleton.c b/ext/skeleton/skeleton.c index 0e90dc0760..de1f5b75fd 100644 --- a/ext/skeleton/skeleton.c +++ b/ext/skeleton/skeleton.c @@ -96,7 +96,7 @@ PHP_MSHUTDOWN_FUNCTION(extname) PHP_RINIT_FUNCTION(extname) { #if defined(COMPILE_DL_EXTNAME) && defined(ZTS) - ZEND_TSRMLS_CACHE_UPDATE; + ZEND_TSRMLS_CACHE_UPDATE(); #endif return SUCCESS; } @@ -154,7 +154,7 @@ zend_module_entry extname_module_entry = { #ifdef COMPILE_DL_EXTNAME #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE(extname) #endif diff --git a/ext/soap/php_soap.h b/ext/soap/php_soap.h index faf677addf..02b734cd3c 100644 --- a/ext/soap/php_soap.h +++ b/ext/soap/php_soap.h @@ -195,7 +195,7 @@ ZEND_EXTERN_MODULE_GLOBALS(soap) #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) diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 6d66ffdc8d..63de00049b 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -467,7 +467,7 @@ zend_module_entry soap_module_entry = { #ifdef COMPILE_DL_SOAP #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE(soap) #endif @@ -606,7 +606,7 @@ PHP_MSHUTDOWN_FUNCTION(soap) 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; @@ -646,7 +646,7 @@ PHP_MINIT_FUNCTION(soap) 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(); diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index a3c8545179..ad68d352c3 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -371,7 +371,7 @@ zend_module_entry sockets_module_entry = { #ifdef COMPILE_DL_SOCKETS #ifdef ZTS - ZEND_TSRMLS_CACHE_DEFINE; + ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE(sockets) #endif @@ -604,7 +604,7 @@ char *sockets_strerror(int error) /* {{{ */ 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; @@ -616,7 +616,7 @@ static PHP_GINIT_FUNCTION(sockets) 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); diff --git a/ext/sqlite3/php_sqlite3.h b/ext/sqlite3/php_sqlite3.h index 4f2c55e730..42752b47db 100644 --- a/ext/sqlite3/php_sqlite3.h +++ b/ext/sqlite3/php_sqlite3.h @@ -33,7 +33,7 @@ ZEND_END_MODULE_GLOBALS(sqlite3) #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) diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index 556f7861f6..044d4f3e69 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -2266,7 +2266,7 @@ PHP_MINFO_FUNCTION(sqlite3) 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)); } @@ -2294,7 +2294,7 @@ zend_module_entry sqlite3_module_entry = { #ifdef COMPILE_DL_SQLITE3 #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE(sqlite3) #endif diff --git a/ext/tidy/php_tidy.h b/ext/tidy/php_tidy.h index 53c0837168..8f4ecf8750 100644 --- a/ext/tidy/php_tidy.h +++ b/ext/tidy/php_tidy.h @@ -42,7 +42,7 @@ ZEND_END_MODULE_GLOBALS(tidy) #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) diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index 5eccbedc32..5985957990 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -468,7 +468,7 @@ zend_module_entry tidy_module_entry = { #ifdef COMPILE_DL_TIDY #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE(tidy) #endif @@ -1058,7 +1058,7 @@ static PHP_MINIT_FUNCTION(tidy) 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")); diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h index 4a7739d3b8..5db0020321 100644 --- a/ext/xml/php_xml.h +++ b/ext/xml/php_xml.h @@ -144,7 +144,7 @@ PHPAPI zend_string *xml_utf8_encode(const char *, size_t, const XML_Char *); #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) diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 10767d8545..0ced7a2284 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -63,7 +63,7 @@ ZEND_DECLARE_MODULE_GLOBALS(xml) /* {{{ 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 */ @@ -294,7 +294,7 @@ static int le_xml_parser; 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"; } diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 67e67b114e..64eac450cd 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -733,7 +733,7 @@ PHP_ZLIB_DECODE_FUNC(gzuncompress, PHP_ZLIB_ENCODING_DEFLATE); #ifdef COMPILE_DL_ZLIB #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE; +ZEND_TSRMLS_CACHE_DEFINE(); #endif ZEND_GET_MODULE(php_zlib) #endif @@ -1020,7 +1020,7 @@ static PHP_MINFO_FUNCTION(zlib) 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; |