svn commit: r363535 - in stable/12: libexec/ftpd usr.bin/localedef usr.sbin/rrenumd

[Don Lewis]

Author: truckman
Date: Sat Jul 25 23:06:47 2020
New Revision: 363535
URL: https://svnweb.freebsd.org/changeset/base/363535

Log:
  MFC r362569 (by jkim):
  
      Fix build with recent byacc.

Modified:
  stable/12/libexec/ftpd/ftpcmd.y
  stable/12/usr.bin/localedef/localedef.c
  stable/12/usr.bin/localedef/localedef.h
  stable/12/usr.sbin/rrenumd/parser.y
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/libexec/ftpd/ftpcmd.y
==============================================================================
--- stable/12/libexec/ftpd/ftpcmd.y	Sat Jul 25 21:37:07 2020	(r363534)
+++ stable/12/libexec/ftpd/ftpcmd.y	Sat Jul 25 23:06:47 2020	(r363535)
@@ -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: stable/12/usr.bin/localedef/localedef.c
==============================================================================
--- stable/12/usr.bin/localedef/localedef.c	Sat Jul 25 21:37:07 2020	(r363534)
+++ stable/12/usr.bin/localedef/localedef.c	Sat Jul 25 23:06:47 2020	(r363535)
@@ -273,7 +273,9 @@ main(int argc, char **argv)
 	init_numeric();
 	init_time();
 
+#if YYDEBUG
 	yydebug = 0;
+#endif
 
 	(void) setlocale(LC_ALL, "");
 

Modified: stable/12/usr.bin/localedef/localedef.h
==============================================================================
--- stable/12/usr.bin/localedef/localedef.h	Sat Jul 25 21:37:07 2020	(r363534)
+++ stable/12/usr.bin/localedef/localedef.h	Sat Jul 25 23:06:47 2020	(r363535)
@@ -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: stable/12/usr.sbin/rrenumd/parser.y
==============================================================================
--- stable/12/usr.sbin/rrenumd/parser.y	Sat Jul 25 21:37:07 2020	(r363534)
+++ stable/12/usr.sbin/rrenumd/parser.y	Sat Jul 25 23:06:47 2020	(r363535)
@@ -141,7 +141,7 @@ statement:
 debug_statement:
 		DEBUG_CMD flag EOS
 		{
-#ifdef YYDEBUG
+#if YYDEBUG
 			yydebug = $2;
 #endif /* YYDEBUG */
 		}