From owner-svn-soc-all@FreeBSD.ORG  Mon Aug  4 13:11:07 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C1835CEE
 for <svn-soc-all@FreeBSD.org>; Mon,  4 Aug 2014 13:11:07 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AFE242A1C
 for <svn-soc-all@FreeBSD.org>; Mon,  4 Aug 2014 13:11:07 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s74DB7ot010228
 for <svn-soc-all@FreeBSD.org>; Mon, 4 Aug 2014 13:11:07 GMT
 (envelope-from dpl@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s74DB7Aw010096
 for svn-soc-all@FreeBSD.org; Mon, 4 Aug 2014 13:11:07 GMT
 (envelope-from dpl@FreeBSD.org)
Date: Mon, 4 Aug 2014 13:11:07 GMT
Message-Id: <201408041311.s74DB7Aw010096@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 dpl@FreeBSD.org using -f
From: dpl@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r271848 - soc2014/dpl/netmap-ipfwjit/extra
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Aug 2014 13:11:07 -0000

Author: dpl
Date: Mon Aug  4 13:11:06 2014
New Revision: 271848
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271848

Log:
  Changed void pointer's type using cast to avoid C++ errors

Modified:
  soc2014/dpl/netmap-ipfwjit/extra/glue.h

Modified: soc2014/dpl/netmap-ipfwjit/extra/glue.h
==============================================================================
--- soc2014/dpl/netmap-ipfwjit/extra/glue.h	Mon Aug  4 13:10:15 2014	(r271847)
+++ soc2014/dpl/netmap-ipfwjit/extra/glue.h	Mon Aug  4 13:11:06 2014	(r271848)
@@ -388,8 +388,8 @@
 static inline void
 _pkt_copy(const void *_src, void *_dst, int l)
 {
-        const uint64_t *src = _src;
-        uint64_t *dst = _dst;
+        const uint64_t *src = (uint64_t *)_src;
+        uint64_t *dst = (uint64_t *)_dst;
 #define likely(x)       __builtin_expect(!!(x), 1)
 #define unlikely(x)       __builtin_expect(!!(x), 0)
         if (unlikely(l >= 1024)) {