From owner-svn-src-stable@freebsd.org  Wed Sep  7 18:06:35 2016
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 B0A0CBD021D;
 Wed,  7 Sep 2016 18:06:35 +0000 (UTC) (envelope-from dim@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 72B7E19E;
 Wed,  7 Sep 2016 18:06:35 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u87I6YCX005908;
 Wed, 7 Sep 2016 18:06:34 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u87I6Y3x005907;
 Wed, 7 Sep 2016 18:06:34 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201609071806.u87I6Y3x005907@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 7 Sep 2016 18:06:34 +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: r305547 - stable/11/contrib/ncurses/ncurses/tinfo
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: Wed, 07 Sep 2016 18:06:35 -0000

Author: dim
Date: Wed Sep  7 18:06:34 2016
New Revision: 305547
URL: https://svnweb.freebsd.org/changeset/base/305547

Log:
  MFC r304920:
  
  In ncurses baudrate definitions, avoid warnings about implicit
  conversions from int to short changing the values.  This applies to
  B38400 and higher, since their values do not fit into a short.
  
  However, since the wrapped values are still unique, and they only serve
  as keys, there is no problem in adding a cast to silence the warnings.
  This also avoids changing the ABI, which would happen if we changed
  NCURSES_OSPEED to int.
  
  Discussed with:	Thomas Dickey

Modified:
  stable/11/contrib/ncurses/ncurses/tinfo/lib_baudrate.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/ncurses/ncurses/tinfo/lib_baudrate.c
==============================================================================
--- stable/11/contrib/ncurses/ncurses/tinfo/lib_baudrate.c	Wed Sep  7 16:46:54 2016	(r305546)
+++ stable/11/contrib/ncurses/ncurses/tinfo/lib_baudrate.c	Wed Sep  7 18:06:34 2016	(r305547)
@@ -94,7 +94,7 @@ struct speed {
     int sp;			/* the actual speed */
 };
 
-#define DATA(number) { B##number, number }
+#define DATA(number) { (NCURSES_OSPEED)B##number, number }
 
 static struct speed const speeds[] =
 {