diff options
| author |   millert <millert@openbsd.org> | 2015-11-20 04:04:40 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2015-11-20 04:04:40 +0000 |
| commit | 44a8a4f7129d8bd84b5cedb869e0b30db1b5fd21 (patch) | |
| tree | d8c76f5eed86c155e3b95737675da54f206718f9 | |
| parent | shuffle struct ifqueue so in flight mbufs are protected by a mutex. (diff) | |
| download | wireguard-openbsd-44a8a4f7129d8bd84b5cedb869e0b30db1b5fd21.tar.xz wireguard-openbsd-44a8a4f7129d8bd84b5cedb869e0b30db1b5fd21.zip | |
Always use the system m4.
| -rw-r--r-- | usr.bin/lex/main.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/usr.bin/lex/main.c b/usr.bin/lex/main.c index 5acbff63dcb..77ad759bd21 100644 --- a/usr.bin/lex/main.c +++ b/usr.bin/lex/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.21 2015/11/19 23:34:56 mmcc Exp $ */ +/* $OpenBSD: main.c,v 1.22 2015/11/20 04:04:40 millert Exp $ */ /* flex - tool to generate fast lexical analyzers */ @@ -228,8 +228,12 @@ main(argc, argv) void check_options() { +<<<<<<< main.c + int i; +======= int i; const char *m4 = NULL; +>>>>>>> 1.20 if (lex_compat) { if (C_plus_plus) @@ -350,6 +354,21 @@ check_options() outfile_created = 1; } +<<<<<<< main.c + + + /* Setup the filter chain. */ + output_chain = filter_create_int(NULL, filter_tee_header, headerfilename); + filter_create_ext(output_chain, M4, "-P", 0); + filter_create_int(output_chain, filter_fix_linedirs, NULL); + + /* For debugging, only run the requested number of filters. */ + if (preproc_level > 0) { + filter_truncate(output_chain, preproc_level); + filter_apply_chain(output_chain); + } + yyout = stdout; +======= /* Setup the filter chain. */ output_chain = filter_create_int(NULL, filter_tee_header, headerfilename); if (!(m4 = getenv("M4"))) @@ -363,6 +382,7 @@ check_options() filter_apply_chain(output_chain); } yyout = stdout; +>>>>>>> 1.20 /* always generate the tablesverify flag. */ |