Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE

nikic · nikic · commit 1ac152938cfe · 2016-03-03T16:50:01.000+01:00
Also re bug #71575.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
diff --git a/ext/sqlite3/php_sqlite3.h b/ext/sqlite3/php_sqlite3.h
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
diff --git a/ext/tidy/php_tidy.h b/ext/tidy/php_tidy.h
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
diff --git a/sapi/cli/php_cli_server.h b/sapi/cli/php_cli_server.h
diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c
diff --git a/sapi/embed/php_embed.h b/sapi/embed/php_embed.h
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
