From owner-svn-src-all@FreeBSD.ORG  Sun Apr 17 16:04:39 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A3F05106564A;
	Sun, 17 Apr 2011 16:04:39 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9216B8FC23;
	Sun, 17 Apr 2011 16:04:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3HG4dWf042619;
	Sun, 17 Apr 2011 16:04:39 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3HG4d0G042617;
	Sun, 17 Apr 2011 16:04:39 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201104171604.p3HG4d0G042617@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 17 Apr 2011 16:04:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220742 - head/sys/sys
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Apr 2011 16:04:39 -0000

Author: jilles
Date: Sun Apr 17 16:04:39 2011
New Revision: 220742
URL: http://svn.freebsd.org/changeset/base/220742

Log:
  Allow using CMSG_NXTHDR with -Wcast-align.
  
  If various checks are omitted, the CMSG_NXTHDR macro expands to
    (struct cmsghdr *)((char *)(cmsg) + \
    _ALIGN(((struct cmsghdr *)(cmsg))->cmsg_len))
  
  Although there is no alignment problem (assuming cmsg is properly aligned
  and _ALIGN is correct), this violates -Wcast-align on strict-alignment
  architectures. Therefore an intermediate cast to void * is appropriate here.
  
  There is no workaround other than not using -Wcast-align.
  
  MFC after:	2 weeks

Modified:
  head/sys/sys/socket.h

Modified: head/sys/sys/socket.h
==============================================================================
--- head/sys/sys/socket.h	Sun Apr 17 15:09:04 2011	(r220741)
+++ head/sys/sys/socket.h	Sun Apr 17 16:04:39 2011	(r220742)
@@ -515,7 +515,7 @@ struct sockcred {
 	  _ALIGN(sizeof(struct cmsghdr)) > \
 	    (char *)(mhdr)->msg_control + (mhdr)->msg_controllen) ? \
 	    (struct cmsghdr *)0 : \
-	    (struct cmsghdr *)((char *)(cmsg) + \
+	    (struct cmsghdr *)(void *)((char *)(cmsg) + \
 	    _ALIGN(((struct cmsghdr *)(cmsg))->cmsg_len)))
 
 /*