From patchwork Mon Oct 1 04:49:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 188216 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B17B32C00E3 for ; Mon, 1 Oct 2012 15:18:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751040Ab2JAFSu (ORCPT ); Mon, 1 Oct 2012 01:18:50 -0400 Received: from quartz.orcorp.ca ([184.70.90.242]:54576 "EHLO quartz.orcorp.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750738Ab2JAFSt (ORCPT ); Mon, 1 Oct 2012 01:18:49 -0400 X-Greylist: delayed 1777 seconds by postgrey-1.27 at vger.kernel.org; Mon, 01 Oct 2012 01:18:49 EDT DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=obsidianresearch.com; s=rsa1; h=Content-Type:MIME-Version:Message-ID:Subject:To:From:Date; bh=/MBG3RUcOmn2695P1nAJyVW5vTIuKZq5NS180rvAmQI=; b=CC7Ye8I1AsTRnsgEYVgUZLv0PsZ+HiAIGU0I7VRoZuuPYFikRcoS6+zTI4Ud0GXev188cfXiqWxc2hd1tkHYavP+aNTi8URh0kmVYKr2kpkYllyJvciP1Uu802BU9MD+XX5Z3gvpNLFkphwqK9ZtdUTiu2DgXAytsCT2mOsBWBY=; Received: from jgg by quartz.orcorp.ca with local (Exim 4.72) (envelope-from ) id 1TIXwN-0002HU-GX for netfilter-devel@vger.kernel.org; Sun, 30 Sep 2012 22:49:11 -0600 Date: Sun, 30 Sep 2012 22:49:11 -0600 From: Jason Gunthorpe To: netfilter-devel@vger.kernel.org Subject: [PATCH] Fix userspace compilation of ip_tables.h/ip6_tables.h in C++ mode Message-ID: <20121001044911.GB8446@obsidianresearch.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org The implicit cast from void * is not allowed for C++ compilers, and the arithmetic on void * generates warnings in C++ mode. $ g++ -c t.cc ip_tables.h:221:24: warning: pointer of type 'void *' used in arithmetic ip_tables.h:221:24: error: invalid conversion from 'void*' to 'xt_entry_target*' Signed-off-by: Jason Gunthorpe --- include/linux/netfilter_ipv4/ip_tables.h | 2 +- include/linux/netfilter_ipv6/ip6_tables.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Repost to the correct list, FWIW, scripts/get_maintainer.pl does not give good advice for these files ;) diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h index db79231..050ad8a 100644 --- a/include/linux/netfilter_ipv4/ip_tables.h +++ b/include/linux/netfilter_ipv4/ip_tables.h @@ -226,7 +226,7 @@ struct ipt_get_entries { static __inline__ struct xt_entry_target * ipt_get_target(struct ipt_entry *e) { - return (void *)e + e->target_offset; + return (struct xt_entry_target *)((__u8 *)e + e->target_offset); } /* diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h index 08c2cbb..3349bf1 100644 --- a/include/linux/netfilter_ipv6/ip6_tables.h +++ b/include/linux/netfilter_ipv6/ip6_tables.h @@ -263,7 +263,7 @@ struct ip6t_get_entries { static __inline__ struct xt_entry_target * ip6t_get_target(struct ip6t_entry *e) { - return (void *)e + e->target_offset; + return (struct xt_entry_target *)((__u8 *)e + e->target_offset); } /*