aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2021-02-17 15:49:38 +0000
committerMark Johnston <markj@FreeBSD.org>2021-02-17 15:57:19 +0000
commit8ba333e02eaa59337a4e1d5534d4e894344c8226 (patch)
tree2e7c70fd69c2c18870c76d3e854f9d429a98e3d4
parentd23b583dfdd5669aeeb0693bdf3b30bfde98d4b4 (diff)
downloadsrc-8ba333e02eaa59337a4e1d5534d4e894344c8226.tar.gz
src-8ba333e02eaa59337a4e1d5534d4e894344c8226.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. PR: 253440 MFC after: 3 days Sponsored by: The FreeBSD Foundation
-rw-r--r--cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h2
-rw-r--r--cddl/lib/libdtrace/Makefile2
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