From owner-svn-src-head@freebsd.org  Wed May 11 16:05:33 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 3E006B37390;
 Wed, 11 May 2016 16:05:33 +0000 (UTC) (envelope-from cem@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 0E4D31785;
 Wed, 11 May 2016 16:05:32 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4BG5WII021754;
 Wed, 11 May 2016 16:05:32 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4BG5WAZ021753;
 Wed, 11 May 2016 16:05:32 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201605111605.u4BG5WAZ021753@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: "Conrad E. Meyer" <cem@FreeBSD.org>
Date: Wed, 11 May 2016 16:05:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r299459 - head/sys/cddl/compat/opensolaris/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 May 2016 16:05:33 -0000

Author: cem
Date: Wed May 11 16:05:32 2016
New Revision: 299459
URL: https://svnweb.freebsd.org/changeset/base/299459

Log:
  compat/opensolaris: Don't redefined off64_t if already defined
  
  A follow-up to r299456.
  
  Reported by:	gjb
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/cddl/compat/opensolaris/sys/types.h

Modified: head/sys/cddl/compat/opensolaris/sys/types.h
==============================================================================
--- head/sys/cddl/compat/opensolaris/sys/types.h	Wed May 11 15:31:31 2016	(r299458)
+++ head/sys/cddl/compat/opensolaris/sys/types.h	Wed May 11 16:05:32 2016	(r299459)
@@ -52,7 +52,10 @@ typedef u_short		ushort_t;
 typedef u_long		ulong_t;
 typedef long long	longlong_t;  
 typedef unsigned long long u_longlong_t;
+#ifndef	_OFF64_T_DECLARED
+#define	_OFF64_T_DECLARED
 typedef off_t		off64_t;
+#endif
 typedef id_t		taskid_t;
 typedef id_t		projid_t;
 typedef id_t		poolid_t;