Moved YY_TEXT_IS_ARRAY to m4.

2 files changed, 9 insertions, 7 deletions

diff --git a/flex.skl b/flex.skl
index 71da4aa..a3637b8 100644
--- a/flex.skl
+++ b/flex.skl
@@ -607,16 +607,18 @@ m4_ifdef( [[M4_YY_USES_REJECT]],
     int yy_lp;
 ]])
 
-#ifdef YY_TEXT_IS_ARRAY
+m4_ifdef( [[M4_YY_TEXT_IS_ARRAY]],
+[[
     char yytext_r[YYLMAX];
     char *yytext_ptr;
     int yy_more_offset;
     int yy_prev_more_offset;
-#else
+]],
+[[
     char *yytext_r;
     int yy_more_flag;
     int yy_more_len;
-#endif
+]])
 
 %if-bison-bridge
     YYSTYPE * yylval_r;
@@ -2302,11 +2304,12 @@ m4_ifdef( [[M4_YY_USES_REJECT]],
     YY_G(yy_lp) = 0;
 ]])
 
-#ifdef YY_TEXT_IS_ARRAY
+m4_ifdef( [[M4_YY_TEXT_IS_ARRAY]],
+[[
     YY_G(yytext_ptr) = 0;
     YY_G(yy_more_offset) = 0;
     YY_G(yy_prev_more_offset) = 0;
-#endif
+]])
 
 /* Defined in main.c */
 #ifdef YY_STDINIT
diff --git a/main.c b/main.c
index d8b066f..fda3df2 100644
--- a/main.c
+++ b/main.c
@@ -401,7 +401,7 @@ void check_options ()
         buf_m4_define (&m4defs_buf, "M4_YY_REENTRANT", NULL);
 		outn ("#define YY_REENTRANT 1");
 		if (yytext_is_array)
-			outn ("#define YY_TEXT_IS_ARRAY");
+			buf_m4_define (&m4defs_buf, "M4_YY_TEXT_IS_ARRAY", NULL);
 	}
 
 	if ( bison_bridge)
@@ -731,7 +731,6 @@ void flexend (exit_status)
                 "YY_START_STACK_INCR",
                 "YY_STATE_EOF",
                 "YY_STDINIT",
-                "YY_TEXT_IS_ARRAY",
                 "YY_TRAILING_HEAD_MASK",
                 "YY_TRAILING_MASK",
                 "YY_USER_ACTION",