From bdeb220f48825642f84cdbf3ff23a30613c92e86 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 13 Dec 2014 23:06:14 +0100 Subject: first shot remove TSRMLS_* things --- sapi/phpdbg/phpdbg_parser.y | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sapi/phpdbg/phpdbg_parser.y') diff --git a/sapi/phpdbg/phpdbg_parser.y b/sapi/phpdbg/phpdbg_parser.y index e4353976f3..e0bd2f89e2 100644 --- a/sapi/phpdbg/phpdbg_parser.y +++ b/sapi/phpdbg/phpdbg_parser.y @@ -180,11 +180,11 @@ static int yyerror(void ***tsrm_ls, const char *msg) { return 0; } -int phpdbg_do_parse(phpdbg_param_t *stack, char *input TSRMLS_DC) { - phpdbg_init_lexer(stack, input TSRMLS_CC); +int phpdbg_do_parse(phpdbg_param_t *stack, char *input) { + phpdbg_init_lexer(stack, input); #ifdef ZTS - return yyparse(TSRMLS_C); + return yyparse(); #else return yyparse(NULL); #endif -- cgit v1.2.1 From 89f87576a1fe9a5839fb239150642b228418d389 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 16 Dec 2014 12:56:00 +0100 Subject: various fixes for removing explicit tsrm_ls usage --- sapi/phpdbg/phpdbg_parser.y | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'sapi/phpdbg/phpdbg_parser.y') diff --git a/sapi/phpdbg/phpdbg_parser.y b/sapi/phpdbg/phpdbg_parser.y index e0bd2f89e2..18d23b834f 100644 --- a/sapi/phpdbg/phpdbg_parser.y +++ b/sapi/phpdbg/phpdbg_parser.y @@ -19,7 +19,7 @@ #include "phpdbg_lexer.h" #undef yyerror -static int yyerror(void ***tsrm_ls, const char *msg); +static int yyerror(const char *msg); ZEND_EXTERN_MODULE_GLOBALS(phpdbg); @@ -36,8 +36,6 @@ typedef void* yyscan_t; #endif } -%parse-param { void *tsrm_ls } - %output "sapi/phpdbg/phpdbg_parser.c" %defines "sapi/phpdbg/phpdbg_parser.h" @@ -166,7 +164,7 @@ full_expression %% -static int yyerror(void ***tsrm_ls, const char *msg) { +static int yyerror(const char *msg) { phpdbg_error("command", "type=\"parseerror\" msg=\"%s\"", "Parse Error: %s", msg); { @@ -183,9 +181,5 @@ static int yyerror(void ***tsrm_ls, const char *msg) { int phpdbg_do_parse(phpdbg_param_t *stack, char *input) { phpdbg_init_lexer(stack, input); -#ifdef ZTS return yyparse(); -#else - return yyparse(NULL); -#endif } -- cgit v1.2.1