4 files changed, 4 insertions, 9 deletions
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index 1d5dfe83125..8031a78b908 100644
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -90,12 +90,6 @@ const uint16 ScanKeywordTokens[] = {
 #define YYSTYPE core_YYSTYPE
 
 /*
- * Set the type of yyextra.  All state variables used by the scanner should
- * be in yyextra, *not* statically allocated.
- */
-#define YY_EXTRA_TYPE core_yy_extra_type *
-
-/*
  * Each call to yylex must set yylloc to the location of the found token
  * (expressed as a byte offset from the start of the input text).
  * When we parse a token that requires multiple lexer rules to process,
@@ -161,6 +155,7 @@ extern void core_yyset_column(int column_no, yyscan_t yyscanner);
 %option noyyfree
 %option warn
 %option prefix="core_yy"
+%option extra-type="core_yy_extra_type *"
 
 /*
  * OK, here is a short description of lex/flex rules behavior.
diff --git a/src/backend/replication/repl_scanner.l b/src/backend/replication/repl_scanner.l
index 0d1ac2d2389..de10cb5abd1 100644
--- a/src/backend/replication/repl_scanner.l
+++ b/src/backend/replication/repl_scanner.l
@@ -46,7 +46,6 @@ struct replication_yy_extra_type
 	/* Work area for collecting literals */
 	StringInfoData litbuf;
 };
-#define YY_EXTRA_TYPE struct replication_yy_extra_type *
 
 static void startlit(yyscan_t yyscanner);
 static char *litbufdup(yyscan_t yyscanner);
@@ -70,6 +69,7 @@ static void addlitchar(unsigned char ychar, yyscan_t yyscanner);
 %option noyyfree
 %option warn
 %option prefix="replication_yy"
+%option extra-type="struct replication_yy_extra_type *"
 
 /*
  * Exclusive states:
diff --git a/src/backend/replication/syncrep_scanner.l b/src/backend/replication/syncrep_scanner.l
index 4db67329956..05e5fdecf1b 100644
--- a/src/backend/replication/syncrep_scanner.l
+++ b/src/backend/replication/syncrep_scanner.l
@@ -41,7 +41,6 @@ struct syncrep_yy_extra_type
 {
 	StringInfoData xdbuf;
 };
-#define YY_EXTRA_TYPE struct syncrep_yy_extra_type *
 
 /* LCOV_EXCL_START */
 
@@ -60,6 +59,7 @@ struct syncrep_yy_extra_type
 %option noyyfree
 %option warn
 %option prefix="syncrep_yy"
+%option extra-type="struct syncrep_yy_extra_type *"
 
 /*
  * <xd> delimited identifiers (double-quoted identifiers)
diff --git a/src/backend/utils/adt/jsonpath_scan.l b/src/backend/utils/adt/jsonpath_scan.l
index 2efc33f9542..c7aab83eeb4 100644
--- a/src/backend/utils/adt/jsonpath_scan.l
+++ b/src/backend/utils/adt/jsonpath_scan.l
@@ -34,7 +34,6 @@ struct jsonpath_yy_extra_type
 {
 	JsonPathString scanstring;
 };
-#define YY_EXTRA_TYPE struct jsonpath_yy_extra_type *
 
 static void addstring(bool init, char *s, int l, yyscan_t yyscanner);
 static void addchar(bool init, char c, yyscan_t yyscanner);
@@ -64,6 +63,7 @@ fprintf_to_ereport(const char *fmt, const char *msg)
 %option noyywrap
 %option warn
 %option prefix="jsonpath_yy"
+%option extra-type="struct jsonpath_yy_extra_type *"
 %option reentrant
 %option bison-bridge
 %option noyyalloc