Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE

1 files changed, 5 insertions, 11 deletions

diff --git a/sapi/phpdbg/phpdbg_parser.y b/sapi/phpdbg/phpdbg_parser.y
index e4353976f3..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);
 
 	{
@@ -180,12 +178,8 @@ 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);
-#else
-	return yyparse(NULL);
-#endif
+	return yyparse();
 }