Fix bug #71575 removing extra semicolons outside macros

diff --git a/NEWS b/NEWS
index 5cf3d517353326525d4140073752abda034de34e..80559e77b852d839a6956ca50ac0ae931ef88433 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,8 @@ PHP                                                                        NEWS
     (setlocale)). (Anatol)
   . Fixed bug #71535 (Integer overflow in zend_mm_alloc_heap()). (Dmitry)
   . Fixed bug #71470 (Leaked 1 hashtable iterators). (Nikita)
+  . Fixed bug #71575 (ISO C does not allow extra ‘;’ outside of a function).
+    (asgrim)
 
 - Curl:
   . Fixed bug #71694 (Support constant CURLM_ADDED_ALREADY). (mpyw)

diff --git a/ext/json/php_json.h b/ext/json/php_json.h
index f1edc6c65a7df9c6e9f945605711e0883b433d47..f0a9b5c73096069382334b2ebaf3123911b232e1 100644 (file)
--- a/ext/json/php_json.h
+++ b/ext/json/php_json.h
@@ -85,7 +85,7 @@ 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)

diff --git a/ext/pcre/php_pcre.h b/ext/pcre/php_pcre.h
index fe69d55e3cc81e578be3696642fe28db8360f461..75157264499461a3646eec6178ad8d05a34e9430 100644 (file)
--- 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 5068c8376151770a1d8c46f9bf0dd84e48a407f3..86ff43bb09ca599c39a714e2d1c222aebed80c3c 100644 (file)
--- 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/sockets/php_sockets.h b/ext/sockets/php_sockets.h
index c6636aaa24e48c45a076d1be630d42aa5e847e57..ce5cdaf313f4f951c511cbb4ba776f48dda444a6 100644 (file)
--- 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/spl/php_spl.h b/ext/spl/php_spl.h
index d1e5d805a93a8e89561b867e75ca7266259115fa..b936cfe45bae7e60980b7fc2dedc264e56b913ef 100644 (file)
--- 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/main/php_output.h b/main/php_output.h
index ef28400d55829c89732e9b7313818924c181f5d7..5d2ea5f9e8c9adf9ae7069fc32d30d1b3e3bd39a 100644 (file)
--- 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/phpdbg/phpdbg_bp.c b/sapi/phpdbg/phpdbg_bp.c
index 5436bda5db62a89b8965a7c29da3f2aacece99e8..4cb1dae42c6b12e6c225669f56ac27bc7d4d9ed1 100644 (file)
--- 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 72739c117c357181b34d7e25c7c145f1a2e9e0a2..0640d96fd872a8002bbfe15faa7644f161dfa28d 100644 (file)
--- 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 34972744285a87d6068df7d518715702b0826b0e..f89e58a13c2240b61d4ad679cb0377325f0a29b3 100644 (file)
--- 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 161a2dd74b9c17f7e0a04ace345bc49294b2051d..eaf9997fb47cc41daeafa463ac53fbf927246a77 100644 (file)
--- 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 ab1b554f7627925c5467f4bd76408f7130c1c276..d6256a84af90a12d85e9fa109fdc743f60ac6790 100644 (file)
--- 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 ff16b49b34dd77e4230cd4de5aa5892fb034d786..97b93f4345e41d24bc9d805e4a7921fd8dbe826e 100644 (file)
--- 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 5d7608fa762208a9523236c97f8dfd3842af63ab..ddd8229c080bf9868340dd3b1f06ee4baec697b5 100644 (file)
--- 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 2e41bdd4fb12d028b35dfc3c8d66476ebea9158d..b2f4ba7c0d8ad5a51ee7ccec747323b53854246f 100644 (file)
--- 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 36c6f422bd8bc05228ae50907bc22dae7c2f3a06..10af103fb02f34d4892670163a5d7d67bba8f7cc 100644 (file)
--- 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 5d1c8b77bab460487e0d0c2fc79f6c7030dc19fb..21c4569480fd3186f6953be4e7a7ee329851fbe7 100644 (file)
--- 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 8bcf6c362bbff38417e7d7e0cf07e551435f95dd..93d741c2a6c144389d2014bf70137cbb2d6c1ef5 100644 (file)
--- 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 0ea4324845232adb59d7bc8bad2c2214245d15f8..e64ab0d636d52072b70c9f01e0260ed1fd69ecad 100644 (file)
--- 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 912e9e80923be499134e5addd1f32c67529192e1..90940ca68c3a493e5164cb59485fd390188dcbab 100644 (file)
--- 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 8a33a107808a5f81193b9ab584e28170817927d7..c5222a0289144e6ff1ee3ba52beb64c433729053 100644 (file)
--- 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 2b8f35776310313d8ec3b0eb8f1c4d4eb9ee41fa..df9be36eee78039d3142fc4fa1400a0d1883bf5f 100644 (file)
--- 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 00209cb239f621d94df24d1d5edafde011ec0712..3725bf608375a9d739b916c43a6fc6b77b03e1f4 100644 (file)
--- 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 31d3c01e46c31a2871c8171557e778835c55be48..a01c8a399f47cb24e78d67ace50b010c5c7809a6 100644 (file)
--- 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 dd78b786976c0ef616beefd9f7c178067ed2c456..47ecbd08b6cb60c363080024a1ec1566fbf38f2d 100644 (file)
--- 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 5183d1fb66fc4584ee1721d98ab98fce32615b93..db334a0dc5d892e8fc3b00dd33648ffd678b4357 100644 (file)
--- 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 54af08ec5b9d553f3ae64245bcf2ad326ef5b3cb..2f987b3a154e4086f92b1ad3099e61655356f100 100644 (file)
--- 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 a944d256aeb7642ea1de5b29a25b2ce45cadca40..7158f3ba6cd455458e95b6d336d94c49c86cd49c 100644 (file)
--- 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 c3ae23b7cd9a356dee556674ce64d9079b17af5b..7972d5ec96e38e5aa4b578c0eefc758700e83251 100644 (file)
--- 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 b1f3fee2ac60324813de01a71c94705f33791152..2c324aa5dcad17bfe0208cf79833cde093798301 100644 (file)
--- 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),