From owner-svn-src-stable-11@freebsd.org  Thu Aug 17 13:48:47 2017
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@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 A9C7ADE2DAC;
 Thu, 17 Aug 2017 13:48:47 +0000 (UTC)
 (envelope-from kevans@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 73C4372B8C;
 Thu, 17 Aug 2017 13:48:47 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7HDmkx8045348;
 Thu, 17 Aug 2017 13:48:46 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7HDmkqe045347;
 Thu, 17 Aug 2017 13:48:46 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201708171348.v7HDmkqe045347@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Thu, 17 Aug 2017 13:48:46 +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: r322619 - stable/11/usr.bin/grep
X-SVN-Group: stable-11
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: stable/11/usr.bin/grep
X-SVN-Commit-Revision: 322619
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Aug 2017 13:48:47 -0000

Author: kevans
Date: Thu Aug 17 13:48:46 2017
New Revision: 322619
URL: https://svnweb.freebsd.org/changeset/base/322619

Log:
  bsdgrep: fix build when linking against libgnuregex
  
  MFC r322618: bsdgrep: cast pmatch.rm_so to fix build when linking against
  libgnuregex
  
  Approved by:	emaste (mentor)

Modified:
  stable/11/usr.bin/grep/util.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/grep/util.c
==============================================================================
--- stable/11/usr.bin/grep/util.c	Thu Aug 17 13:40:45 2017	(r322618)
+++ stable/11/usr.bin/grep/util.c	Thu Aug 17 13:48:46 2017	(r322619)
@@ -450,7 +450,7 @@ procline(struct parsec *pc)
 				 */
 				if (r == REG_NOMATCH &&
 				    (retry == pc->lnstart ||
-				    pmatch.rm_so + 1 < retry))
+				    (unsigned int)pmatch.rm_so + 1 < retry))
 					retry = pmatch.rm_so + 1;
 				if (r == REG_NOMATCH)
 					continue;