From owner-svn-src-all@freebsd.org Sat Jul 25 23:06:48 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BA0C03734B0; Sat, 25 Jul 2020 23:06:48 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BDhXS4GMNz3X2Z; Sat, 25 Jul 2020 23:06:48 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 75C6423413; Sat, 25 Jul 2020 23:06:48 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06PN6maK015462; Sat, 25 Jul 2020 23:06:48 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06PN6lRU015458; Sat, 25 Jul 2020 23:06:47 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <202007252306.06PN6lRU015458@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Sat, 25 Jul 2020 23:06:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r363535 - in stable/12: libexec/ftpd usr.bin/localedef usr.sbin/rrenumd X-SVN-Group: stable-12 X-SVN-Commit-Author: truckman X-SVN-Commit-Paths: in stable/12: libexec/ftpd usr.bin/localedef usr.sbin/rrenumd X-SVN-Commit-Revision: 363535 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Jul 2020 23:06:48 -0000 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 */ }