Merge branch 'PHP-7.0'

92 files changed, 97 insertions, 93 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 9591a67c5b..50cda403f6 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 b1bd8a1cd0..ca85619d4c 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 153bfff035..0f3c889b21 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 971fe15f05..bd7c0b0c1b 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -176,7 +176,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 d8bf0dfe9d..d1fabd1e6b 100644
--- a/ext/json/php_json.h
+++ b/ext/json/php_json.h
@@ -86,11 +86,11 @@ ZEND_BEGIN_MODULE_GLOBALS(json)
 	php_json_error_code error_code;
 ZEND_END_MODULE_GLOBALS(json)
 
-PHP_JSON_API ZEND_EXTERN_MODULE_GLOBALS(json);
+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 d6282b8126..e55fab6bb2 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -1024,7 +1024,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 7bfffa83c8..c75023c3ad 100644
--- a/ext/mysqli/php_mysqli_structs.h
+++ b/ext/mysqli/php_mysqli_structs.h
@@ -341,7 +341,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 232f2ea43b..9107be966a 100644
--- a/ext/mysqlnd/mysqlnd.h
+++ b/ext/mysqlnd/mysqlnd.h
@@ -332,7 +332,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 22a60a26ca..193e4767ae 100644
--- a/ext/mysqlnd/php_mysqlnd.c
+++ b/ext/mysqlnd/php_mysqlnd.c
@@ -360,7 +360,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 f1dc0e185c..84bb34e604 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 7a6cf8b108..f1240cbaff 100644
--- a/ext/opcache/ZendAccelerator.h
+++ b/ext/opcache/ZendAccelerator.h
@@ -286,7 +286,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/pcre/php_pcre.h b/ext/pcre/php_pcre.h
index fe69d55e3c..7515726449 100644
--- a/ext/pcre/php_pcre.h
+++ b/ext/pcre/php_pcre.h
@@ -81,7 +81,7 @@ ZEND_BEGIN_MODULE_GLOBALS(pcre)
 	int  error_code;
 ZEND_END_MODULE_GLOBALS(pcre)
 
-PHPAPI ZEND_EXTERN_MODULE_GLOBALS(pcre);
+PHPAPI ZEND_EXTERN_MODULE_GLOBALS(pcre)
 #define PCRE_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(pcre, v)
 
 #else
diff --git a/ext/pdo_dblib/php_pdo_dblib_int.h b/ext/pdo_dblib/php_pdo_dblib_int.h
index 5068c83761..86ff43bb09 100644
--- a/ext/pdo_dblib/php_pdo_dblib_int.h
+++ b/ext/pdo_dblib/php_pdo_dblib_int.h
@@ -137,7 +137,7 @@ ZEND_END_MODULE_GLOBALS(dblib)
 # define DBLIB_G(v) (dblib_globals.v)
 #endif
 
-ZEND_EXTERN_MODULE_GLOBALS(dblib);
+ZEND_EXTERN_MODULE_GLOBALS(dblib)
 
 #endif
 
diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c
index 5eedc6bd07..fdf7062f62 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 0438663353..20d640c405 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 b59f5a6e5b..0b2fd29be6 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -780,7 +780,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 08d98de1ec..12549d7bfe 100644
--- a/ext/pgsql/php_pgsql.h
+++ b/ext/pgsql/php_pgsql.h
@@ -325,7 +325,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 71498b6a13..72880c79d4 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -3212,7 +3212,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 610482b290..cd562ea411 100644
--- a/ext/phar/phar_internal.h
+++ b/ext/phar/phar_internal.h
@@ -196,7 +196,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
 
 #include "pharzip.h"
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 866fab68a4..b72674fdde 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -3120,7 +3120,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/session/tests/bug69111.phpt b/ext/session/tests/bug69111.phpt
index 75b78f01ac..c6d10c74a0 100644
--- a/ext/session/tests/bug69111.phpt
+++ b/ext/session/tests/bug69111.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Bug #69111 Crash in SessionHandler::read()
---SKIPIF--
 --XFAIL--
 It is still a leak
+--SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
 <?php
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 08d5bc0514..fcfa2511eb 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/php_sockets.h b/ext/sockets/php_sockets.h
index c6636aaa24..ce5cdaf313 100644
--- a/ext/sockets/php_sockets.h
+++ b/ext/sockets/php_sockets.h
@@ -92,7 +92,7 @@ ZEND_BEGIN_MODULE_GLOBALS(sockets)
 	char *strerror_buf;
 ZEND_END_MODULE_GLOBALS(sockets)
 
-ZEND_EXTERN_MODULE_GLOBALS(sockets);
+ZEND_EXTERN_MODULE_GLOBALS(sockets)
 #define SOCKETS_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(sockets, v)
 
 enum sockopt_return {
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/spl/php_spl.h b/ext/spl/php_spl.h
index d1e5d805a9..b936cfe45b 100644
--- a/ext/spl/php_spl.h
+++ b/ext/spl/php_spl.h
@@ -68,7 +68,7 @@ ZEND_BEGIN_MODULE_GLOBALS(spl)
 	int          autoload_running;
 ZEND_END_MODULE_GLOBALS(spl)
 
-ZEND_EXTERN_MODULE_GLOBALS(spl);
+ZEND_EXTERN_MODULE_GLOBALS(spl)
 #define SPL_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(spl, v)
 
 PHP_FUNCTION(spl_classes);
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 1bccb9d7f1..3c7239021f 100644
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@ -2293,7 +2293,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 e18b4e7eef..a3a42655d0 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/main/php_output.h b/main/php_output.h
index ef28400d55..5d2ea5f9e8 100644
--- a/main/php_output.h
+++ b/main/php_output.h
@@ -146,7 +146,7 @@ ZEND_BEGIN_MODULE_GLOBALS(output)
 	int flags;
 ZEND_END_MODULE_GLOBALS(output)
 
-PHPAPI ZEND_EXTERN_MODULE_GLOBALS(output);
+PHPAPI ZEND_EXTERN_MODULE_GLOBALS(output)
 
 /* there should not be a need to use OG() from outside of output.c */
 #ifdef ZTS
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 3058e62815..e758b33eeb 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -203,7 +203,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/cli/tests/upload_2G.phpt b/sapi/cli/tests/upload_2G.phpt
index 313dcd5ac1..bd36ad6cda 100644
--- a/sapi/cli/tests/upload_2G.phpt
+++ b/sapi/cli/tests/upload_2G.phpt
@@ -21,6 +21,10 @@ if ($f = fopen("/proc/meminfo","r")) {
 if (empty($enough_free_ram)) {
 	die("skip need +3G free RAM");
 }
+
+if (getenv('TRAVIS')) {
+    die("skip Fails intermittently on travis");
+}
 ?>
 --FILE--
 <?php
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);
diff --git a/sapi/phpdbg/phpdbg_bp.c b/sapi/phpdbg/phpdbg_bp.c
index 5436bda5db..4cb1dae42c 100644
--- a/sapi/phpdbg/phpdbg_bp.c
+++ b/sapi/phpdbg/phpdbg_bp.c
@@ -26,7 +26,7 @@
 #include "phpdbg_opcode.h"
 #include "zend_globals.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 /* {{{ private api functions */
 static inline phpdbg_breakbase_t *phpdbg_find_breakpoint_file(zend_op_array*);
diff --git a/sapi/phpdbg/phpdbg_break.c b/sapi/phpdbg/phpdbg_break.c
index 72739c117c..0640d96fd8 100644
--- a/sapi/phpdbg/phpdbg_break.c
+++ b/sapi/phpdbg/phpdbg_break.c
@@ -26,7 +26,7 @@
 #include "phpdbg_bp.h"
 #include "phpdbg_prompt.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 #define PHPDBG_BREAK_COMMAND_D(f, h, a, m, l, s, flags) \
 	PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[9], flags)
diff --git a/sapi/phpdbg/phpdbg_cmd.c b/sapi/phpdbg/phpdbg_cmd.c
index 3497274428..f89e58a13c 100644
--- a/sapi/phpdbg/phpdbg_cmd.c
+++ b/sapi/phpdbg/phpdbg_cmd.c
@@ -25,7 +25,7 @@
 #include "phpdbg_prompt.h"
 #include "phpdbg_io.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 static inline const char *phpdbg_command_name(const phpdbg_command_t *command, char *buffer) {
 	size_t pos = 0;
diff --git a/sapi/phpdbg/phpdbg_eol.c b/sapi/phpdbg/phpdbg_eol.c
index 161a2dd74b..eaf9997fb4 100644
--- a/sapi/phpdbg/phpdbg_eol.c
+++ b/sapi/phpdbg/phpdbg_eol.c
@@ -23,7 +23,7 @@
 #include "phpdbg.h"
 #include "phpdbg_eol.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 #define EOL_LIST_LEN 4
 struct phpdbg_eol_rep phpdbg_eol_list[EOL_LIST_LEN] = {
diff --git a/sapi/phpdbg/phpdbg_frame.c b/sapi/phpdbg/phpdbg_frame.c
index ab1b554f76..d6256a84af 100644
--- a/sapi/phpdbg/phpdbg_frame.c
+++ b/sapi/phpdbg/phpdbg_frame.c
@@ -24,7 +24,7 @@
 #include "phpdbg_frame.h"
 #include "phpdbg_list.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 void phpdbg_restore_frame(void) /* {{{ */
 {
diff --git a/sapi/phpdbg/phpdbg_help.c b/sapi/phpdbg/phpdbg_help.c
index b93effc8eb..fb73419910 100644
--- a/sapi/phpdbg/phpdbg_help.c
+++ b/sapi/phpdbg/phpdbg_help.c
@@ -25,7 +25,7 @@
 #include "phpdbg_eol.h"
 #include "zend.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 /* {{{ Commands Table */
 #define PHPDBG_COMMAND_HELP_D(name, tip, alias, action) \
diff --git a/sapi/phpdbg/phpdbg_info.c b/sapi/phpdbg/phpdbg_info.c
index 5d7608fa76..ddd8229c08 100644
--- a/sapi/phpdbg/phpdbg_info.c
+++ b/sapi/phpdbg/phpdbg_info.c
@@ -25,7 +25,7 @@
 #include "phpdbg_bp.h"
 #include "phpdbg_prompt.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 #define PHPDBG_INFO_COMMAND_D(f, h, a, m, l, s, flags) \
 	PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[13], flags)
diff --git a/sapi/phpdbg/phpdbg_io.c b/sapi/phpdbg/phpdbg_io.c
index 2e41bdd4fb..b2f4ba7c0d 100644
--- a/sapi/phpdbg/phpdbg_io.c
+++ b/sapi/phpdbg/phpdbg_io.c
@@ -45,7 +45,7 @@
 #include <poll.h>
 #endif
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 /* is easy to generalize ... but not needed for now */
 PHPDBG_API int phpdbg_consume_stdin_line(char *buf) {
diff --git a/sapi/phpdbg/phpdbg_lexer.c b/sapi/phpdbg/phpdbg_lexer.c
index 36c6f422bd..10af103fb0 100644
--- a/sapi/phpdbg/phpdbg_lexer.c
+++ b/sapi/phpdbg/phpdbg_lexer.c
@@ -28,7 +28,7 @@
 #define RAW 2
 #define INITIAL 3
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 void phpdbg_init_lexer (phpdbg_param_t *stack, char *input) {
 	PHPDBG_G(parser_stack) = stack;
diff --git a/sapi/phpdbg/phpdbg_lexer.l b/sapi/phpdbg/phpdbg_lexer.l
index 5d1c8b77ba..21c4569480 100644
--- a/sapi/phpdbg/phpdbg_lexer.l
+++ b/sapi/phpdbg/phpdbg_lexer.l
@@ -26,7 +26,7 @@
 #define RAW 2
 #define INITIAL 3
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 void phpdbg_init_lexer (phpdbg_param_t *stack, char *input) {
 	PHPDBG_G(parser_stack) = stack;
diff --git a/sapi/phpdbg/phpdbg_list.c b/sapi/phpdbg/phpdbg_list.c
index 8bcf6c362b..93d741c2a6 100644
--- a/sapi/phpdbg/phpdbg_list.c
+++ b/sapi/phpdbg/phpdbg_list.c
@@ -33,7 +33,7 @@
 #include "php_streams.h"
 #include "zend_exceptions.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 #define PHPDBG_LIST_COMMAND_D(f, h, a, m, l, s, flags) \
 	PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[12], flags)
diff --git a/sapi/phpdbg/phpdbg_opcode.c b/sapi/phpdbg/phpdbg_opcode.c
index ccd7337e5c..8bd7c4e50e 100644
--- a/sapi/phpdbg/phpdbg_opcode.c
+++ b/sapi/phpdbg/phpdbg_opcode.c
@@ -25,7 +25,7 @@
 #include "phpdbg_utils.h"
 #include "ext/standard/php_string.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 static inline const char *phpdbg_decode_opcode(zend_uchar opcode) /* {{{ */
 {
diff --git a/sapi/phpdbg/phpdbg_out.c b/sapi/phpdbg/phpdbg_out.c
index 912e9e8092..90940ca68c 100644
--- a/sapi/phpdbg/phpdbg_out.c
+++ b/sapi/phpdbg/phpdbg_out.c
@@ -30,7 +30,7 @@
 #	include "win32/time.h"
 #endif
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 /* copied from php-src/main/snprintf.c and slightly modified */
 /*
diff --git a/sapi/phpdbg/phpdbg_parser.c b/sapi/phpdbg/phpdbg_parser.c
index 8a33a10780..c5222a0289 100644
--- a/sapi/phpdbg/phpdbg_parser.c
+++ b/sapi/phpdbg/phpdbg_parser.c
@@ -94,7 +94,7 @@
 #undef yyerror
 static int yyerror(const char *msg);
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 #ifdef _MSC_VER
 #define YYMALLOC malloc
diff --git a/sapi/phpdbg/phpdbg_parser.y b/sapi/phpdbg/phpdbg_parser.y
index 2b8f357763..df9be36eee 100644
--- a/sapi/phpdbg/phpdbg_parser.y
+++ b/sapi/phpdbg/phpdbg_parser.y
@@ -21,7 +21,7 @@
 #undef yyerror
 static int yyerror(const char *msg);
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 #ifdef _MSC_VER
 #define YYMALLOC malloc
diff --git a/sapi/phpdbg/phpdbg_print.c b/sapi/phpdbg/phpdbg_print.c
index 00209cb239..3725bf6083 100644
--- a/sapi/phpdbg/phpdbg_print.c
+++ b/sapi/phpdbg/phpdbg_print.c
@@ -24,7 +24,7 @@
 #include "phpdbg_opcode.h"
 #include "phpdbg_prompt.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 #define PHPDBG_PRINT_COMMAND_D(f, h, a, m, l, s, flags) \
 	PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[8], flags)
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c
index 8a4bd3a3ac..ac86c15629 100644
--- a/sapi/phpdbg/phpdbg_prompt.c
+++ b/sapi/phpdbg/phpdbg_prompt.c
@@ -48,7 +48,7 @@
 #error "phpdbg can only be built with CALL zend vm kind"
 #endif
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 extern int phpdbg_startup_run;
 
 #ifdef HAVE_LIBDL
diff --git a/sapi/phpdbg/phpdbg_set.c b/sapi/phpdbg/phpdbg_set.c
index dd78b78697..47ecbd08b6 100644
--- a/sapi/phpdbg/phpdbg_set.c
+++ b/sapi/phpdbg/phpdbg_set.c
@@ -25,7 +25,7 @@
 #include "phpdbg_bp.h"
 #include "phpdbg_prompt.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 #define PHPDBG_SET_COMMAND_D(f, h, a, m, l, s, flags) \
 	PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[17], flags)
diff --git a/sapi/phpdbg/phpdbg_sigio_win32.c b/sapi/phpdbg/phpdbg_sigio_win32.c
index 5183d1fb66..db334a0dc5 100644
--- a/sapi/phpdbg/phpdbg_sigio_win32.c
+++ b/sapi/phpdbg/phpdbg_sigio_win32.c
@@ -23,7 +23,7 @@
 #include "phpdbg_sigio_win32.h"
 
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 
 VOID
diff --git a/sapi/phpdbg/phpdbg_sigsafe.c b/sapi/phpdbg/phpdbg_sigsafe.c
index 54af08ec5b..2f987b3a15 100644
--- a/sapi/phpdbg/phpdbg_sigsafe.c
+++ b/sapi/phpdbg/phpdbg_sigsafe.c
@@ -1,7 +1,7 @@
 #include "phpdbg_sigsafe.h"
 #include "phpdbg.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 #define STR(x) #x
 #define EXP_STR(x) STR(x)
diff --git a/sapi/phpdbg/phpdbg_utils.c b/sapi/phpdbg/phpdbg_utils.c
index a944d256ae..7158f3ba6c 100644
--- a/sapi/phpdbg/phpdbg_utils.c
+++ b/sapi/phpdbg/phpdbg_utils.c
@@ -38,7 +38,7 @@
 # endif
 #endif
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 /* {{{ color structures */
 const static phpdbg_color_t colors[] = {
diff --git a/sapi/phpdbg/phpdbg_wait.c b/sapi/phpdbg/phpdbg_wait.c
index c3ae23b7cd..7972d5ec96 100644
--- a/sapi/phpdbg/phpdbg_wait.c
+++ b/sapi/phpdbg/phpdbg_wait.c
@@ -21,7 +21,7 @@
 #include "ext/standard/php_var.h"
 #include "ext/standard/basic_functions.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 static void phpdbg_rebuild_http_globals_array(int type, const char *name) {
 	zval *zvp;
diff --git a/sapi/phpdbg/phpdbg_watch.c b/sapi/phpdbg/phpdbg_watch.c
index b1f3fee2ac..2c324aa5dc 100644
--- a/sapi/phpdbg/phpdbg_watch.c
+++ b/sapi/phpdbg/phpdbg_watch.c
@@ -80,7 +80,7 @@
 # include <sys/mman.h>
 #endif
 
-ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 const phpdbg_command_t phpdbg_watch_commands[] = {
 	PHPDBG_COMMAND_D_EX(array,      "create watchpoint on an array", 'a', watch_array,     &phpdbg_prompt_commands[24], "s", 0),