Skip to content

Commit c4b1888

Browse files
asgrimnikic
asgrim
authored and
nikic
committed
Fix bug #71575 removing extra semicolons outside macros
1 parent 5527c5b commit c4b1888

30 files changed

+31
-29
lines changed

‎NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ PHP NEWS
1313
(setlocale)). (Anatol)
1414
. Fixed bug #71535 (Integer overflow in zend_mm_alloc_heap()). (Dmitry)
1515
. Fixed bug #71470 (Leaked 1 hashtable iterators). (Nikita)
16+
. Fixed bug #71575 (ISO C does not allow extra ‘;’ outside of a function).
17+
(asgrim)
1618

1719
- Curl:
1820
. Fixed bug #71694 (Support constant CURLM_ADDED_ALREADY). (mpyw)

‎ext/json/php_json.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ ZEND_BEGIN_MODULE_GLOBALS(json)
8585
php_json_error_code error_code;
8686
ZEND_END_MODULE_GLOBALS(json)
8787

88-
PHP_JSON_API ZEND_EXTERN_MODULE_GLOBALS(json);
88+
PHP_JSON_API ZEND_EXTERN_MODULE_GLOBALS(json)
8989
#define JSON_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(json, v)
9090

9191
#if defined(ZTS) && defined(COMPILE_DL_JSON)

‎ext/pcre/php_pcre.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ ZEND_BEGIN_MODULE_GLOBALS(pcre)
8181
int error_code;
8282
ZEND_END_MODULE_GLOBALS(pcre)
8383

84-
PHPAPI ZEND_EXTERN_MODULE_GLOBALS(pcre);
84+
PHPAPI ZEND_EXTERN_MODULE_GLOBALS(pcre)
8585
#define PCRE_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(pcre, v)
8686

8787
#else

‎ext/pdo_dblib/php_pdo_dblib_int.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ ZEND_END_MODULE_GLOBALS(dblib)
137137
# define DBLIB_G(v) (dblib_globals.v)
138138
#endif
139139

140-
ZEND_EXTERN_MODULE_GLOBALS(dblib);
140+
ZEND_EXTERN_MODULE_GLOBALS(dblib)
141141

142142
#endif
143143

‎ext/sockets/php_sockets.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ ZEND_BEGIN_MODULE_GLOBALS(sockets)
9292
char *strerror_buf;
9393
ZEND_END_MODULE_GLOBALS(sockets)
9494

95-
ZEND_EXTERN_MODULE_GLOBALS(sockets);
95+
ZEND_EXTERN_MODULE_GLOBALS(sockets)
9696
#define SOCKETS_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(sockets, v)
9797

9898
enum sockopt_return {

‎ext/spl/php_spl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ZEND_BEGIN_MODULE_GLOBALS(spl)
6868
int autoload_running;
6969
ZEND_END_MODULE_GLOBALS(spl)
7070

71-
ZEND_EXTERN_MODULE_GLOBALS(spl);
71+
ZEND_EXTERN_MODULE_GLOBALS(spl)
7272
#define SPL_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(spl, v)
7373

7474
PHP_FUNCTION(spl_classes);

‎main/php_output.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ ZEND_BEGIN_MODULE_GLOBALS(output)
146146
int flags;
147147
ZEND_END_MODULE_GLOBALS(output)
148148

149-
PHPAPI ZEND_EXTERN_MODULE_GLOBALS(output);
149+
PHPAPI ZEND_EXTERN_MODULE_GLOBALS(output)
150150

151151
/* there should not be a need to use OG() from outside of output.c */
152152
#ifdef ZTS

‎sapi/phpdbg/phpdbg_bp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "phpdbg_opcode.h"
2727
#include "zend_globals.h"
2828

29-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
29+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
3030

3131
/* {{{ private api functions */
3232
static inline phpdbg_breakbase_t *phpdbg_find_breakpoint_file(zend_op_array*);

‎sapi/phpdbg/phpdbg_break.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "phpdbg_bp.h"
2727
#include "phpdbg_prompt.h"
2828

29-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
29+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
3030

3131
#define PHPDBG_BREAK_COMMAND_D(f, h, a, m, l, s, flags) \
3232
PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[9], flags)

‎sapi/phpdbg/phpdbg_cmd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "phpdbg_prompt.h"
2626
#include "phpdbg_io.h"
2727

28-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
28+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
2929

3030
static inline const char *phpdbg_command_name(const phpdbg_command_t *command, char *buffer) {
3131
size_t pos = 0;

‎sapi/phpdbg/phpdbg_eol.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "phpdbg.h"
2424
#include "phpdbg_eol.h"
2525

26-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
26+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
2727

2828
#define EOL_LIST_LEN 4
2929
struct phpdbg_eol_rep phpdbg_eol_list[EOL_LIST_LEN] = {

‎sapi/phpdbg/phpdbg_frame.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "phpdbg_frame.h"
2525
#include "phpdbg_list.h"
2626

27-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
27+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
2828

2929
void phpdbg_restore_frame(void) /* {{{ */
3030
{

‎sapi/phpdbg/phpdbg_help.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "phpdbg_eol.h"
2626
#include "zend.h"
2727

28-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
28+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
2929

3030
/* {{{ Commands Table */
3131
#define PHPDBG_COMMAND_HELP_D(name, tip, alias, action) \

‎sapi/phpdbg/phpdbg_info.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "phpdbg_bp.h"
2626
#include "phpdbg_prompt.h"
2727

28-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
28+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
2929

3030
#define PHPDBG_INFO_COMMAND_D(f, h, a, m, l, s, flags) \
3131
PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[13], flags)

‎sapi/phpdbg/phpdbg_io.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
#include <poll.h>
4646
#endif
4747

48-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
48+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
4949

5050
/* is easy to generalize ... but not needed for now */
5151
PHPDBG_API int phpdbg_consume_stdin_line(char *buf) {

‎sapi/phpdbg/phpdbg_lexer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#define RAW 2
2929
#define INITIAL 3
3030

31-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
31+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
3232

3333
void phpdbg_init_lexer (phpdbg_param_t *stack, char *input) {
3434
PHPDBG_G(parser_stack) = stack;

‎sapi/phpdbg/phpdbg_lexer.l

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#define RAW 2
2727
#define INITIAL 3
2828

29-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
29+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
3030

3131
void phpdbg_init_lexer (phpdbg_param_t *stack, char *input) {
3232
PHPDBG_G(parser_stack) = stack;

‎sapi/phpdbg/phpdbg_list.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "php_streams.h"
3434
#include "zend_exceptions.h"
3535

36-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
36+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
3737

3838
#define PHPDBG_LIST_COMMAND_D(f, h, a, m, l, s, flags) \
3939
PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[12], flags)

‎sapi/phpdbg/phpdbg_opcode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "phpdbg_utils.h"
2626
#include "ext/standard/php_string.h"
2727

28-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
28+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
2929

3030
static inline const char *phpdbg_decode_opcode(zend_uchar opcode) /* {{{ */
3131
{

‎sapi/phpdbg/phpdbg_out.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
# include "win32/time.h"
3131
#endif
3232

33-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
33+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
3434

3535
/* copied from php-src/main/snprintf.c and slightly modified */
3636
/*

‎sapi/phpdbg/phpdbg_parser.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
#undef yyerror
9595
static int yyerror(const char *msg);
9696

97-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
97+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
9898

9999
#ifdef _MSC_VER
100100
#define YYMALLOC malloc

‎sapi/phpdbg/phpdbg_parser.y

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#undef yyerror
2222
static int yyerror(const char *msg);
2323

24-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
24+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
2525

2626
#ifdef _MSC_VER
2727
#define YYMALLOC malloc

‎sapi/phpdbg/phpdbg_print.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "phpdbg_opcode.h"
2525
#include "phpdbg_prompt.h"
2626

27-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
27+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
2828

2929
#define PHPDBG_PRINT_COMMAND_D(f, h, a, m, l, s, flags) \
3030
PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[8], flags)

‎sapi/phpdbg/phpdbg_prompt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
#error "phpdbg can only be built with CALL zend vm kind"
4949
#endif
5050

51-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
51+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
5252
extern int phpdbg_startup_run;
5353

5454
#ifdef HAVE_LIBDL

‎sapi/phpdbg/phpdbg_set.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "phpdbg_bp.h"
2626
#include "phpdbg_prompt.h"
2727

28-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
28+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
2929

3030
#define PHPDBG_SET_COMMAND_D(f, h, a, m, l, s, flags) \
3131
PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[17], flags)

‎sapi/phpdbg/phpdbg_sigio_win32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "phpdbg_sigio_win32.h"
2424

2525

26-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
26+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
2727

2828

2929
VOID

‎sapi/phpdbg/phpdbg_sigsafe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "phpdbg_sigsafe.h"
22
#include "phpdbg.h"
33

4-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
4+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
55

66
#define STR(x) #x
77
#define EXP_STR(x) STR(x)

‎sapi/phpdbg/phpdbg_utils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
# endif
3939
#endif
4040

41-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
41+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
4242

4343
/* {{{ color structures */
4444
const static phpdbg_color_t colors[] = {

‎sapi/phpdbg/phpdbg_wait.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "ext/standard/php_var.h"
2222
#include "ext/standard/basic_functions.h"
2323

24-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
24+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
2525

2626
static void phpdbg_rebuild_http_globals_array(int type, const char *name) {
2727
zval *zvp;

‎sapi/phpdbg/phpdbg_watch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
# include <sys/mman.h>
8181
#endif
8282

83-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
83+
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
8484

8585
const phpdbg_command_t phpdbg_watch_commands[] = {
8686
PHPDBG_COMMAND_D_EX(array, "create watchpoint on an array", 'a', watch_array, &phpdbg_prompt_commands[24], "s", 0),

0 commit comments

Comments
 (0)