diff options
30 files changed, 31 insertions, 29 deletions
@@ -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 f1edc6c65a..f0a9b5c730 100644 --- 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 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/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/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/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/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 ff16b49b34..97b93f4345 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 0ea4324845..e64ab0d636 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 31d3c01e46..a01c8a399f 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), |