From owner-svn-src-projects@freebsd.org  Thu Nov 16 15:16:55 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 4B0AFDE0A22
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu, 16 Nov 2017 15:16:55 +0000 (UTC)
 (envelope-from hselasky@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 152C87E39A;
 Thu, 16 Nov 2017 15:16:55 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAGFGsAC060393;
 Thu, 16 Nov 2017 15:16:54 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAGFGspX060392;
 Thu, 16 Nov 2017 15:16:54 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201711161516.vAGFGspX060392@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Thu, 16 Nov 2017 15:16:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r325895 - projects/bsd_rdma_4_9/contrib/ofed/include
X-SVN-Group: projects
X-SVN-Commit-Author: hselasky
X-SVN-Commit-Paths: projects/bsd_rdma_4_9/contrib/ofed/include
X-SVN-Commit-Revision: 325895
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Nov 2017 15:16:55 -0000

Author: hselasky
Date: Thu Nov 16 15:16:53 2017
New Revision: 325895
URL: https://svnweb.freebsd.org/changeset/base/325895

Log:
  Remove conflicting uint definition.
  
  Already defined by sys/types.h
  
  Sponsored by:	Mellanox Technologies

Modified:
  projects/bsd_rdma_4_9/contrib/ofed/include/types.h

Modified: projects/bsd_rdma_4_9/contrib/ofed/include/types.h
==============================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/include/types.h	Thu Nov 16 15:13:28 2017	(r325894)
+++ projects/bsd_rdma_4_9/contrib/ofed/include/types.h	Thu Nov 16 15:16:53 2017	(r325895)
@@ -58,6 +58,4 @@ typedef uint32_t __be32;
 typedef uint64_t __le64;
 typedef uint64_t __be64;
 
-typedef unsigned int    uint;
-
 #endif	/* _INFINIBAND_TYPES_H_ */