From owner-svn-src-stable@freebsd.org  Mon Jun 12 17:37:19 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4B620C08F59;
 Mon, 12 Jun 2017 17:37:19 +0000 (UTC)
 (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 19EC5777C4;
 Mon, 12 Jun 2017 17:37:19 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5CHbIku005443;
 Mon, 12 Jun 2017 17:37:18 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5CHbImQ005442;
 Mon, 12 Jun 2017 17:37:18 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201706121737.v5CHbImQ005442@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Mon, 12 Jun 2017 17:37:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r319860 - stable/11/contrib/byacc/test/yacc
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2017 17:37:19 -0000

Author: ngie
Date: Mon Jun 12 17:37:18 2017
New Revision: 319860
URL: https://svnweb.freebsd.org/changeset/base/319860

Log:
  MFC r313398:
  
  Approved by:	re (gjb)
  
  Apply r274475's to expr.oxout.tab.c to fix the test on FreeBSD
  
  YYINT on FreeBSD is int, not short
  
  I'll work with the upstream maintainer or come up with a build
  method of modifying their definitions on install instead of
  having to modify tests to match our forked YYINT definition.
  
  PR:		216891

Modified:
  stable/11/contrib/byacc/test/yacc/expr.oxout.tab.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/byacc/test/yacc/expr.oxout.tab.c
==============================================================================
--- stable/11/contrib/byacc/test/yacc/expr.oxout.tab.c	Mon Jun 12 17:22:23 2017	(r319859)
+++ stable/11/contrib/byacc/test/yacc/expr.oxout.tab.c	Mon Jun 12 17:37:18 2017	(r319860)
@@ -178,7 +178,7 @@ extern int YYPARSE_DECL();
 #define ID 257
 #define CONST 258
 #define YYERRCODE 256
-typedef short YYINT;
+typedef int YYINT;
 static const YYINT expr.oxout_lhs[] = {                  -1,
     2,    0,    1,    3,    3,    3,    3,    3,    3,    3,
 };