openGauss编译适配 flex2.6 以上版本

2022-01-19 17:58:03 +08:00 · 2022-01-19 17:58:03 +08:00 · 26cf5e54b1
parent 3fe1bf4cb7
commit 26cf5e54b1
3 changed files with 4 additions and 0 deletions
--- a/src/common/backend/parser/gram.y
+++ b/src/common/backend/parser/gram.y
@ -25799,5 +25799,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"