php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #71575 removing extra semicolons outside macros

Browse Source
This commit is contained in:
James Titcumb
2016-02-16 22:47:37 +00:00
committed by Nikita Popov
parent 5527c5b083
commit c4b188871e
30 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -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)

2
ext/json/php_json.h
View File

@@ -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)

2
ext/pcre/php_pcre.h
View File

@@ -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

2
ext/pdo_dblib/php_pdo_dblib_int.h
View File

@@ -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

2
ext/sockets/php_sockets.h
View File

@@ -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 {

2
ext/spl/php_spl.h
View File

@@ -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);

2
main/php_output.h
View File

@@ -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

2
sapi/phpdbg/phpdbg_bp.c
View File

@@ -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*);

2
sapi/phpdbg/phpdbg_break.c
View File

@@ -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)

2
sapi/phpdbg/phpdbg_cmd.c
View File

@@ -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;

2
sapi/phpdbg/phpdbg_eol.c
View File

@@ -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] = {

2
sapi/phpdbg/phpdbg_frame.c
View File

@@ -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) /* {{{ */
{

2
sapi/phpdbg/phpdbg_help.c
View File

@@ -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) \

2
sapi/phpdbg/phpdbg_info.c
View File

@@ -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)

2
sapi/phpdbg/phpdbg_io.c
View File

@@ -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) {

2
sapi/phpdbg/phpdbg_lexer.c
View File

@@ -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;

2
sapi/phpdbg/phpdbg_lexer.l
View File

@@ -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;

2
sapi/phpdbg/phpdbg_list.c
View File

@@ -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)

2
sapi/phpdbg/phpdbg_opcode.c
View File

@@ -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) /* {{{ */
{

2
sapi/phpdbg/phpdbg_out.c
View File

@@ -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 */
/*

2
sapi/phpdbg/phpdbg_parser.c
View File

@@ -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

2
sapi/phpdbg/phpdbg_parser.y
View File

@@ -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

2
sapi/phpdbg/phpdbg_print.c
View File

@@ -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)

2
sapi/phpdbg/phpdbg_prompt.c
View File

@@ -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

2
sapi/phpdbg/phpdbg_set.c
View File

@@ -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)

2
sapi/phpdbg/phpdbg_sigio_win32.c
View File

@@ -23,7 +23,7 @@
#include "phpdbg_sigio_win32.h"
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
VOID

2
sapi/phpdbg/phpdbg_sigsafe.c
View File

@@ -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)

2
sapi/phpdbg/phpdbg_utils.c
View File

@@ -38,7 +38,7 @@
# endif
#endif
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
/* {{{ color structures */
const static phpdbg_color_t colors[] = {

2
sapi/phpdbg/phpdbg_wait.c
View File

@@ -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;

2
sapi/phpdbg/phpdbg_watch.c
View File

@@ -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),