diff options
| -rw-r--r-- | src/flex.skl | 8 | ||||
| -rw-r--r-- | src/main.c | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/flex.skl b/src/flex.skl index 6f2a00b..e125e3a 100644 --- a/src/flex.skl +++ b/src/flex.skl @@ -111,9 +111,10 @@ m4_ifdef( [[M4_YY_REENTRANT]], [[m4_define([[M4_YY_HAS_START_STACK_VARS]])]]) m4_ifdef( [[M4_YY_PREFIX]],, [[m4_define([[M4_YY_PREFIX]], [[yy]])]]) -m4preproc_define(`M4_GEN_PREFIX', - ``[[#define yy$1 ]]M4_YY_PREFIX[[$1]] -%# m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') +m4preproc_define(`M4_GEN_PREFIX',`` +[[#define yy$1 ]]M4_YY_PREFIX[[$1]] +'m4preproc_divert(1)` +[[#undef yy$1]]'m4preproc_divert(0)') %if-c++-only /* The c++ scanner is a mess. The FlexLexer.h header file relies on the @@ -3415,4 +3416,5 @@ m4_ifdef( [[M4_YY_IN_HEADER]], #undef YY_DECL_IS_OURS #undef YY_DECL #endif +m4preproc_undivert(1) ]]) @@ -310,8 +310,8 @@ void check_options (void) } } - if (extra_type) - buf_m4_define( &m4defs_buf, "M4_EXTRA_TYPE_DEFS", extra_type); + if (extra_type) + buf_m4_define( &m4defs_buf, "M4_EXTRA_TYPE_DEFS", extra_type); if (!use_stdout) { FILE *prev_stdout; |