From 8ecdea2458d5e51f0a4ab20b6d6b953a8cae7e70 Mon Sep 17 00:00:00 2001
From: Don Lewis <truckman@FreeBSD.org>
Date: Sat, 25 Jul 2020 23:08:51 +0000
Subject: [PATCH] MFC r362569 (by jkim):

    Fix build with recent byacc.

S3curity:
---
 libexec/ftpd/ftpcmd.y         | 2 ++
 usr.bin/localedef/localedef.c | 2 ++
 usr.bin/localedef/localedef.h | 2 ++
 usr.sbin/rrenumd/parser.y     | 2 +-
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index 8d4e3bdeae2f..50e573513c47 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -72,6 +72,8 @@ __FBSDID("$FreeBSD$");
 #include "extern.h"
 #include "pathnames.h"
 
+#define	yylex	ftpcmd_yylex
+
 off_t	restart_point;
 
 static	int cmd_type;
diff --git a/usr.bin/localedef/localedef.c b/usr.bin/localedef/localedef.c
index 1bfc48684d63..f3714e7b07d9 100644
--- a/usr.bin/localedef/localedef.c
+++ b/usr.bin/localedef/localedef.c
@@ -257,7 +257,9 @@ main(int argc, char **argv)
 	init_numeric();
 	init_time();
 
+#if YYDEBUG
 	yydebug = 0;
+#endif
 
 	(void) setlocale(LC_ALL, "");
 
diff --git a/usr.bin/localedef/localedef.h b/usr.bin/localedef/localedef.h
index 624199ee63e3..6a0b8ec019a9 100644
--- a/usr.bin/localedef/localedef.h
+++ b/usr.bin/localedef/localedef.h
@@ -47,7 +47,9 @@ extern int mb_cur_max;
 extern int mb_cur_min;
 extern int last_kw;
 extern int verbose;
+#if YYDEBUG
 extern int yydebug;
+#endif
 extern int lineno;
 extern int undefok;	/* mostly ignore undefined symbols */
 extern int warnok;
diff --git a/usr.sbin/rrenumd/parser.y b/usr.sbin/rrenumd/parser.y
index 6436df709b2e..85c2da41a403 100644
--- a/usr.sbin/rrenumd/parser.y
+++ b/usr.sbin/rrenumd/parser.y
@@ -139,7 +139,7 @@ statement:
 debug_statement:
 		DEBUG_CMD flag EOS
 		{
-#ifdef YYDEBUG
+#if YYDEBUG
 			yydebug = $2;
 #endif /* YYDEBUG */
 		}