Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE

Also re bug #71575.

62 files changed, 63 insertions, 63 deletions

diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index 248d3fbdee..f9bb241050 100644
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@ -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_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_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL
+#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE;
+#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL;
 #if ZEND_DEBUG
 #define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache()
 #else
diff --git a/TSRM/tsrm_win32.h b/TSRM/tsrm_win32.h
index bddf4c1d2e..fbeac07b01 100644
--- a/TSRM/tsrm_win32.h
+++ b/TSRM/tsrm_win32.h
@@ -72,7 +72,7 @@ typedef struct {
 
 #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
diff --git a/Zend/zend.c b/Zend/zend.c
index eeeb2c6784..d036152307 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -148,7 +148,7 @@ static HashTable *global_class_table = NULL;
 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;
diff --git a/Zend/zend.h b/Zend/zend.h
index a3f849a4e6..ebaddd74b6 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -77,7 +77,7 @@
 #define ZEND_TSRMLS_CACHE
 #endif
 
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 
 #ifdef HAVE_NORETURN
 # ifdef ZEND_NORETURN_ALIAS
diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c
index f50c555843..fd14050f05 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
diff --git a/ext/bcmath/php_bcmath.h b/ext/bcmath/php_bcmath.h
index 734eb7778a..9075d16b30 100644
--- a/ext/bcmath/php_bcmath.h
+++ b/ext/bcmath/php_bcmath.h
@@ -52,7 +52,7 @@ ZEND_BEGIN_MODULE_GLOBALS(bcmath)
 ZEND_END_MODULE_GLOBALS(bcmath)
 
 #if defined(ZTS) && defined(COMPILE_DL_BCMATH)
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 ZEND_EXTERN_MODULE_GLOBALS(bcmath)
diff --git a/ext/com_dotnet/com_extension.c b/ext/com_dotnet/com_extension.c
index 9141eba642..c439bba515 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
diff --git a/ext/com_dotnet/php_com_dotnet.h b/ext/com_dotnet/php_com_dotnet.h
index f57b84bb85..640f5db08f 100644
--- a/ext/com_dotnet/php_com_dotnet.h
+++ b/ext/com_dotnet/php_com_dotnet.h
@@ -56,7 +56,7 @@ ZEND_BEGIN_MODULE_GLOBALS(com_dotnet)
 ZEND_END_MODULE_GLOBALS(com_dotnet)
 
 #if defined(ZTS) && defined(COMPILE_DL_COM_DOTNET)
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 extern ZEND_DECLARE_MODULE_GLOBALS(com_dotnet);
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index ebac695b2f..7e001029c9 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -155,7 +155,7 @@ ZEND_DECLARE_MODULE_GLOBALS(exif)
 #define EXIF_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(exif, v)
 
 #if defined(ZTS) && defined(COMPILE_DL_EXIF)
-ZEND_TSRMLS_CACHE_DEFINE();
+ZEND_TSRMLS_CACHE_DEFINE()
 #endif
 
 /* {{{ PHP_INI
diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 1d6a16c754..2c8dde9d49 100644
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -152,7 +152,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
diff --git a/ext/filter/php_filter.h b/ext/filter/php_filter.h
index e6711b7673..44c15d78d0 100644
--- a/ext/filter/php_filter.h
+++ b/ext/filter/php_filter.h
@@ -66,7 +66,7 @@ ZEND_BEGIN_MODULE_GLOBALS(filter)
 ZEND_END_MODULE_GLOBALS(filter)
 
 #if defined(COMPILE_DL_FILTER) && defined(ZTS)
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 #define IF_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(filter, v)
diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
index 84b375aad8..56235e0c68 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
diff --git a/ext/gmp/php_gmp.h b/ext/gmp/php_gmp.h
index 5f5f136b33..d8a1d0c5a6 100644
--- a/ext/gmp/php_gmp.h
+++ b/ext/gmp/php_gmp.h
@@ -98,7 +98,7 @@ ZEND_END_MODULE_GLOBALS(gmp)
 #define GMPG(v) ZEND_MODULE_GLOBALS_ACCESSOR(gmp, v)
 
 #if defined(ZTS) && defined(COMPILE_DL_GMP)
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 #else
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 4dd6784209..d4a7f6e0af 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
diff --git a/ext/iconv/php_iconv.h b/ext/iconv/php_iconv.h
index 31b2a8d511..f8003df9d3 100644
--- a/ext/iconv/php_iconv.h
+++ b/ext/iconv/php_iconv.h
@@ -78,7 +78,7 @@ ZEND_END_MODULE_GLOBALS(iconv)
 #define ICONVG(v) ZEND_MODULE_GLOBALS_ACCESSOR(iconv, v)
 
 #if defined(ZTS) && defined(COMPILE_DL_ICONV)
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 #ifdef HAVE_IBM_ICONV
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index b4c253838e..d1174cf576 100644
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -461,7 +461,7 @@ zend_module_entry ibase_module_entry = {
 
 #ifdef COMPILE_DL_INTERBASE
 #ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE();
+ZEND_TSRMLS_CACHE_DEFINE()
 #endif
 ZEND_GET_MODULE(ibase)
 #endif
diff --git a/ext/interbase/php_ibase_includes.h b/ext/interbase/php_ibase_includes.h
index 860f94b876..e2000c1c5f 100644
--- a/ext/interbase/php_ibase_includes.h
+++ b/ext/interbase/php_ibase_includes.h
@@ -130,7 +130,7 @@ enum php_interbase_option {
 #define IBG(v) ZEND_MODULE_GLOBALS_ACCESSOR(ibase, v)
 
 #if defined(ZTS) && defined(COMPILE_DL_INTERBASE)
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 #define BLOB_ID_LEN		18
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c
index 12bd9fdc74..fd35e57120 100644
--- a/ext/intl/php_intl.c
+++ b/ext/intl/php_intl.c
@@ -892,7 +892,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
diff --git a/ext/intl/php_intl.h b/ext/intl/php_intl.h
index b8d1600edb..e672e54087 100644
--- a/ext/intl/php_intl.h
+++ b/ext/intl/php_intl.h
@@ -56,7 +56,7 @@ ZEND_BEGIN_MODULE_GLOBALS(intl)
 ZEND_END_MODULE_GLOBALS(intl)
 
 #if defined(ZTS) && defined(COMPILE_DL_INTL)
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 ZEND_EXTERN_MODULE_GLOBALS(intl)
diff --git a/ext/json/json.c b/ext/json/json.c
index 20bbcdc59e..81258cb734 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -175,7 +175,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/json/php_json.h b/ext/json/php_json.h
index f0a9b5c730..7bcca27335 100644
--- a/ext/json/php_json.h
+++ b/ext/json/php_json.h
@@ -89,7 +89,7 @@ PHP_JSON_API ZEND_EXTERN_MODULE_GLOBALS(json)
 #define JSON_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(json, v)
 
 #if defined(ZTS) && defined(COMPILE_DL_JSON)
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 PHP_JSON_API void php_json_encode(smart_str *buf, zval *val, int options);
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
index 24812449ee..1969a97959 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 */
diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
index 345af030b2..11fca74938 100644
--- a/ext/libxml/php_libxml.h
+++ b/ext/libxml/php_libxml.h
@@ -118,7 +118,7 @@ PHP_LIBXML_API void php_libxml_shutdown(void);
 #define LIBXML(v) ZEND_MODULE_GLOBALS_ACCESSOR(libxml, v)
 
 #if defined(ZTS) && defined(COMPILE_DL_LIBXML)
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 #else /* HAVE_LIBXML */
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index b5812cb402..d65e7c78b8 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -591,7 +591,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
diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h
index 7cfab95d27..71d63b13de 100644
--- a/ext/mbstring/mbstring.h
+++ b/ext/mbstring/mbstring.h
@@ -205,7 +205,7 @@ struct mb_overload_def {
 #define MBSTRG(v) ZEND_MODULE_GLOBALS_ACCESSOR(mbstring, v)
 
 #if defined(ZTS) && defined(COMPILE_DL_MBSTRING)
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 #else	/* HAVE_MBSTRING */
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index 456c40ae71..073bfec775 100644
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -273,7 +273,7 @@ zend_module_entry mcrypt_module_entry = {
 
 #ifdef COMPILE_DL_MCRYPT
 #ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE();
+ZEND_TSRMLS_CACHE_DEFINE()
 #endif
 ZEND_GET_MODULE(mcrypt)
 #endif
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 41b5783d18..594dd0da35 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -1031,7 +1031,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 4ef13fd198..d231b774e1 100644
--- a/ext/mysqli/php_mysqli_structs.h
+++ b/ext/mysqli/php_mysqli_structs.h
@@ -345,7 +345,7 @@ ZEND_END_MODULE_GLOBALS(mysqli)
 #define MyG(v) ZEND_MODULE_GLOBALS_ACCESSOR(mysqli, v)
 
 #if defined(ZTS) && defined(COMPILE_DL_MYSQLI)
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 #define my_estrdup(x) (x) ? estrdup(x) : NULL
diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h
index f59eb767fe..fd3bfdab64 100644
--- a/ext/mysqlnd/mysqlnd.h
+++ b/ext/mysqlnd/mysqlnd.h
@@ -284,7 +284,7 @@ PHPAPI ZEND_EXTERN_MODULE_GLOBALS(mysqlnd)
 #define MYSQLND_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(mysqlnd, v)
 
 #if defined(ZTS) && defined(COMPILE_DL_MYSQLND)
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 
diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c
index 77e8199b0c..8598b59421 100644
--- a/ext/mysqlnd/php_mysqlnd.c
+++ b/ext/mysqlnd/php_mysqlnd.c
@@ -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/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index d835dfb9a0..03288713c9 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -412,7 +412,7 @@ zend_module_entry odbc_module_entry = {
 
 #ifdef COMPILE_DL_ODBC
 #ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE();
+ZEND_TSRMLS_CACHE_DEFINE()
 #endif
 ZEND_GET_MODULE(odbc)
 #endif
diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h
index fa525ed4ad..93e2c96871 100644
--- a/ext/odbc/php_odbc_includes.h
+++ b/ext/odbc/php_odbc_includes.h
@@ -308,7 +308,7 @@ PHP_ODBC_API ZEND_EXTERN_MODULE_GLOBALS(odbc)
 #define ODBCG(v) ZEND_MODULE_GLOBALS_ACCESSOR(odbc, v)
 
 #if defined(ZTS) && defined(COMPILE_DL_ODBC)
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 #endif /* HAVE_UODBC */
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index 48b8d6a682..8eddb4b76e 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -97,7 +97,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
 
diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h
index 89664a2a23..99db6a2564 100644
--- a/ext/opcache/ZendAccelerator.h
+++ b/ext/opcache/ZendAccelerator.h
@@ -308,7 +308,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 546514435e..7ed1647d8a 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
diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h
index 89b9e80fa0..a4290fdaf3 100644
--- a/ext/pdo_mysql/php_pdo_mysql_int.h
+++ b/ext/pdo_mysql/php_pdo_mysql_int.h
@@ -89,7 +89,7 @@ ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql)
 #define PDO_MYSQL_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(pdo_mysql, v)
 
 #if defined(ZTS) && defined(COMPILE_DL_PDO_MYSQL)
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 82cefe36c6..86421e9531 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
diff --git a/ext/pgsql/php_pgsql.h b/ext/pgsql/php_pgsql.h
index f2833c9a6b..9088130a82 100644
--- a/ext/pgsql/php_pgsql.h
+++ b/ext/pgsql/php_pgsql.h
@@ -326,7 +326,7 @@ ZEND_EXTERN_MODULE_GLOBALS(pgsql)
 # define PGG(v) ZEND_MODULE_GLOBALS_ACCESSOR(pgsql, v)
 
 #if defined(ZTS) && defined(COMPILE_DL_PGSQL)
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 #endif
diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 63feb3cfb8..18feace9f9 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -3229,7 +3229,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
diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h
index 1e7ab7a324..e0ae624dc9 100644
--- a/ext/phar/phar_internal.h
+++ b/ext/phar/phar_internal.h
@@ -198,7 +198,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phar)
 #define PHAR_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(phar, v)
 
 #if defined(ZTS) && defined(COMPILE_DL_PHAR)
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 #ifndef php_uint16
diff --git a/ext/session/php_session.h b/ext/session/php_session.h
index b2ddef901d..a3b4de82f0 100644
--- a/ext/session/php_session.h
+++ b/ext/session/php_session.h
@@ -220,7 +220,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 10094424d4..994d76217a 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -3099,7 +3099,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 8518f8095a..1514563a70 100644
--- a/ext/skeleton/php_skeleton.h
+++ b/ext/skeleton/php_skeleton.h
@@ -37,7 +37,7 @@ ZEND_END_MODULE_GLOBALS(extname)
 #define EXTNAME_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(extname, v)
 
 #if defined(ZTS) && defined(COMPILE_DL_EXTNAME)
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 #endif	/* PHP_EXTNAME_H */
diff --git a/ext/skeleton/skeleton.c b/ext/skeleton/skeleton.c
index 9531d1985e..50f3271e20 100644
--- a/ext/skeleton/skeleton.c
+++ b/ext/skeleton/skeleton.c
@@ -153,7 +153,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 3d032db031..5736f1043a 100644
--- a/ext/soap/php_soap.h
+++ b/ext/soap/php_soap.h
@@ -192,7 +192,7 @@ ZEND_EXTERN_MODULE_GLOBALS(soap)
 #define SOAP_GLOBAL(v) ZEND_MODULE_GLOBALS_ACCESSOR(soap, v)
 
 #if defined(ZTS) && defined(COMPILE_DL_SOAP)
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 extern zend_class_entry* soap_var_class_entry;
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index ee41ff908f..11c2d7caa6 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
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 6de9ab1fe7..a207225f1c 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
diff --git a/ext/sqlite3/php_sqlite3.h b/ext/sqlite3/php_sqlite3.h
index a13173734e..c93a18d17c 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 912cc9cb2d..e497d7b183 100644
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@ -2314,7 +2314,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 ead8102133..c229baf34c 100644
--- a/ext/tidy/php_tidy.h
+++ b/ext/tidy/php_tidy.h
@@ -45,7 +45,7 @@ ZEND_END_MODULE_GLOBALS(tidy)
 #define TG(v) ZEND_MODULE_GLOBALS_ACCESSOR(tidy, v)
 
 #if defined(ZTS) && defined(COMPILE_DL_TIDY)
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 #endif
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 7a4a7e7d6a..c5d43b097b 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -466,7 +466,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
diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h
index 0aa55a5fac..47757c9b8c 100644
--- a/ext/xml/php_xml.h
+++ b/ext/xml/php_xml.h
@@ -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)
 
 #if defined(ZTS) && defined(COMPILE_DL_XML)
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 #endif /* PHP_XML_H */
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index bfa1b85b99..439d9df082 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 */
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index bfca0f42f7..d9d6be1638 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -1187,7 +1187,7 @@ PHP_FUNCTION(deflate_add)
 
 #ifdef COMPILE_DL_ZLIB
 #ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE();
+ZEND_TSRMLS_CACHE_DEFINE()
 #endif
 ZEND_GET_MODULE(php_zlib)
 #endif
diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h
index 451e4e3e4c..c1c52f5697 100644
--- a/sapi/apache2handler/php_apache.h
+++ b/sapi/apache2handler/php_apache.h
@@ -80,7 +80,7 @@ extern zend_module_entry apache2_module_entry;
 #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)
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 4c69fa6b4d..456b9719fa 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -66,7 +66,7 @@
 /* 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
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index c1cca1e3d2..8983b53dc2 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -202,7 +202,7 @@ static void user_config_cache_entry_dtor(zval *el)
 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;
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 907f629c01..92f1f64bf4 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -103,7 +103,7 @@ PHPAPI extern char *php_ini_scanned_path;
 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
diff --git a/sapi/cli/php_cli_server.h b/sapi/cli/php_cli_server.h
index d1092f65e1..cdf30bce2a 100644
--- a/sapi/cli/php_cli_server.h
+++ b/sapi/cli/php_cli_server.h
@@ -33,7 +33,7 @@ ZEND_END_MODULE_GLOBALS(cli_server)
 
 #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
diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c
index 289dc121df..18c2027271 100644
--- a/sapi/embed/php_embed.c
+++ b/sapi/embed/php_embed.c
@@ -34,7 +34,7 @@ const char HARDCODED_INI[] =
 	"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)
diff --git a/sapi/embed/php_embed.h b/sapi/embed/php_embed.h
index cde1fcef8d..92a2f70be7 100644
--- a/sapi/embed/php_embed.h
+++ b/sapi/embed/php_embed.h
@@ -45,7 +45,7 @@
 #endif
 
 #ifdef ZTS
-ZEND_TSRMLS_CACHE_EXTERN();
+ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
 BEGIN_EXTERN_C()
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index 9321eed2d3..68a164c499 100644
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@ -53,7 +53,7 @@
 #endif
 
 #if defined(PHP_WIN32) && defined(ZTS)
-ZEND_TSRMLS_CACHE_DEFINE();
+ZEND_TSRMLS_CACHE_DEFINE()
 #endif
 
 ZEND_DECLARE_MODULE_GLOBALS(phpdbg);