svn commit: r362569 - in head: libexec/ftpd usr.bin/localedef usr.sbin/rrenumd

[Jung-uk Kim]

Author: jkim
Date: Wed Jun 24 02:08:08 2020
New Revision: 362569
URL: https://svnweb.freebsd.org/changeset/base/362569

Log:
  Fix build with recent byacc.

Modified:
  head/libexec/ftpd/ftpcmd.y
  head/usr.bin/localedef/localedef.c
  head/usr.bin/localedef/localedef.h
  head/usr.sbin/rrenumd/parser.y

Modified: head/libexec/ftpd/ftpcmd.y
==============================================================================
--- head/libexec/ftpd/ftpcmd.y	Wed Jun 24 01:51:05 2020	(r362568)
+++ head/libexec/ftpd/ftpcmd.y	Wed Jun 24 02:08:08 2020	(r362569)
@@ -74,6 +74,8 @@ __FBSDID("$FreeBSD$");
 #include "extern.h"
 #include "pathnames.h"
 
+#define	yylex	ftpcmd_yylex
+
 off_t	restart_point;
 
 static	int cmd_type;

Modified: head/usr.bin/localedef/localedef.c
==============================================================================
--- head/usr.bin/localedef/localedef.c	Wed Jun 24 01:51:05 2020	(r362568)
+++ head/usr.bin/localedef/localedef.c	Wed Jun 24 02:08:08 2020	(r362569)
@@ -273,7 +273,9 @@ main(int argc, char **argv)
 	init_numeric();
 	init_time();
 
+#if YYDEBUG
 	yydebug = 0;
+#endif
 
 	(void) setlocale(LC_ALL, "");
 

Modified: head/usr.bin/localedef/localedef.h
==============================================================================
--- head/usr.bin/localedef/localedef.h	Wed Jun 24 01:51:05 2020	(r362568)
+++ head/usr.bin/localedef/localedef.h	Wed Jun 24 02:08:08 2020	(r362569)
@@ -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;

Modified: head/usr.sbin/rrenumd/parser.y
==============================================================================
--- head/usr.sbin/rrenumd/parser.y	Wed Jun 24 01:51:05 2020	(r362568)
+++ head/usr.sbin/rrenumd/parser.y	Wed Jun 24 02:08:08 2020	(r362569)
@@ -141,7 +141,7 @@ statement:
 debug_statement:
 		DEBUG_CMD flag EOS
 		{
-#ifdef YYDEBUG
+#if YYDEBUG
 			yydebug = $2;
 #endif /* YYDEBUG */
 		}