diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2021-02-17 15:49:38 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2021-02-22 21:59:36 +0000 |
| commit | ae093a0614f30d4cdffb853e4eba93322e8ed8f4 (patch) | |
| tree | 71ab7266786e300ce3bb1315b4e8e164b85d3093 | |
| parent | 4e3fa977a14f7c69a39aacd8788a437527767dac (diff) | |
| download | src-ae093a0614f30d4cdffb853e4eba93322e8ed8f4.tar.gz src-ae093a0614f30d4cdffb853e4eba93322e8ed8f4.zip | |
libdtrace: Stop relying on lex compatibility
It does not appear to be required, and as of commit 6b7e592c215f
("lex: Do not let input() return 0 when end-of-file is reached") it
causes input to return 0 instead of EOF when end-of-input is reached.
Approved by: re (gjb)
PR: 253440
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 8ba333e02eaa59337a4e1d5534d4e894344c8226)
(cherry picked from commit af80731179386cf019463e392370b6478a714aea)
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h | 2 | ||||
| -rw-r--r-- | cddl/lib/libdtrace/Makefile | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h index f2c60a2b07d4..b3f69bb6329d 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h @@ -717,7 +717,7 @@ extern dt_pcb_t *yypcb; /* pointer to current parser control block */ extern char yyintprefix; /* int token prefix for macros (+/-) */ extern char yyintsuffix[4]; /* int token suffix ([uUlL]*) */ extern int yyintdecimal; /* int token is decimal (1) or octal/hex (0) */ -extern char yytext[]; /* lex input buffer */ +extern char *yytext; /* lex input buffer */ extern int yylineno; /* lex line number */ extern int yydebug; /* lex debugging */ extern dt_node_t *yypragma; /* lex token list for control lines */ diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile index efd73751e2c0..45ca1692cf48 100644 --- a/cddl/lib/libdtrace/Makefile +++ b/cddl/lib/libdtrace/Makefile @@ -129,8 +129,6 @@ SRCS+= dis_tables.c DSRCS+= regs_x86.d .endif -LFLAGS+=-l - YFLAGS+=-d LIBADD= ctf elf proc pthread rtld_db |