From owner-svn-src-head@freebsd.org  Thu Jul  6 05:32:24 2017
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 0C536DA0E7C;
 Thu,  6 Jul 2017 05:32:24 +0000 (UTC)
 (envelope-from rlibby@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 742B5819E5;
 Thu,  6 Jul 2017 05:32:23 +0000 (UTC)
 (envelope-from rlibby@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v665WMca018398;
 Thu, 6 Jul 2017 05:32:22 GMT (envelope-from rlibby@FreeBSD.org)
Received: (from rlibby@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v665WMk8018397;
 Thu, 6 Jul 2017 05:32:22 GMT (envelope-from rlibby@FreeBSD.org)
Message-Id: <201707060532.v665WMk8018397@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rlibby set sender to
 rlibby@FreeBSD.org using -f
From: Ryan Libby <rlibby@FreeBSD.org>
Date: Thu, 6 Jul 2017 05:32:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r320714 - head/sys/dev/hptmv
X-SVN-Group: head
X-SVN-Commit-Author: rlibby
X-SVN-Commit-Paths: head/sys/dev/hptmv
X-SVN-Commit-Revision: 320714
X-SVN-Commit-Repository: base
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.23
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: Thu, 06 Jul 2017 05:32:24 -0000

Author: rlibby
Date: Thu Jul  6 05:32:22 2017
New Revision: 320714
URL: https://svnweb.freebsd.org/changeset/base/320714

Log:
  hptmv: avoid gcc variably-modified warning
  
  gcc produces a "variably modified X at file scope" warning for
  structures that use these size definitions.
  
  PR:		211540
  Reviewed by:	markj
  Approved by:	markj (mentor)
  Sponsored by:	Dell EMC Isilon
  Differential revision:	https://reviews.freebsd.org/D11416

Modified:
  head/sys/dev/hptmv/vdevice.h

Modified: head/sys/dev/hptmv/vdevice.h
==============================================================================
--- head/sys/dev/hptmv/vdevice.h	Thu Jul  6 05:30:11 2017	(r320713)
+++ head/sys/dev/hptmv/vdevice.h	Thu Jul  6 05:32:22 2017	(r320714)
@@ -77,8 +77,8 @@ typedef  struct _VDevice
 
 } VDevice;
 
-#define ARRAY_VDEV_SIZE ((UINT)(ULONG_PTR)&((PVDevice)0)->u+sizeof(RaidArray))
-#define DISK_VDEV_SIZE  ((UINT)(ULONG_PTR)&((PVDevice)0)->u+sizeof(Device))
+#define ARRAY_VDEV_SIZE (offsetof(VDevice, u) + sizeof(RaidArray))
+#define DISK_VDEV_SIZE  (offsetof(VDevice, u) + sizeof(Device))
 
 #define Map2pVDevice(pDev) ((PVDevice)((UINT_PTR)pDev - (UINT)(UINT_PTR)&((PVDevice)0)->u.disk))