!1488 opengauss编译适配flex 2.6以上版本

Merge pull request !1488 from zhangxubo/flexversion
2022-02-24 08:32:10 +00:00
parent e160a27a8e 26cf5e54b1
commit 88da95eb84
3 changed files with 4 additions and 0 deletions
--- a/src/common/backend/parser/gram.y
+++ b/src/common/backend/parser/gram.y
@ -25802,5 +25802,6 @@ static void RemoveFillerCol(List *filler_list, List *col_list)
 #undef yyerror
 #undef yylval
 #undef yylloc
+#undef yylex

 #include "scan.inc"
--- a/src/gausskernel/storage/replication/repl_gram.y
+++ b/src/gausskernel/storage/replication/repl_gram.y
@ -445,4 +445,6 @@ replication_yylex(YYSTYPE *lvalp, YYLTYPE *llocp,
 	return replication_scanner_yylex(&(lvalp->yy_core), llocp, yyscanner);
 }

+#undef yylex
+
 #include "repl_scanner.inc"
--- a/src/gausskernel/storage/replication/syncrep_gram.y
+++ b/src/gausskernel/storage/replication/syncrep_gram.y
@ -170,5 +170,6 @@ create_syncrep_config(const char *num_sync, List *members, uint8 syncrep_method)
 #undef yyerror
 #undef yylval
 #undef yylloc
+#undef yylex

 #include "syncrep_scanner.inc"