From owner-svn-src-all@FreeBSD.ORG  Sun Mar 23 19:07:15 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 61A6D97C;
 Sun, 23 Mar 2014 19:07:15 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4D4AFA7B;
 Sun, 23 Mar 2014 19:07:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2NJ7Fu0048167;
 Sun, 23 Mar 2014 19:07:15 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2NJ7FEP048166;
 Sun, 23 Mar 2014 19:07:15 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201403231907.s2NJ7FEP048166@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Sun, 23 Mar 2014 19:07:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r263668 - stable/10/usr.sbin/route6d
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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, 23 Mar 2014 19:07:15 -0000

Author: glebius
Date: Sun Mar 23 19:07:14 2014
New Revision: 263668
URL: http://svnweb.freebsd.org/changeset/base/263668

Log:
  Merge r263658 from head: remove unneeded fake _KERNEL definition.
  Should fix broken builds.

Modified:
  stable/10/usr.sbin/route6d/route6d.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/route6d/route6d.c
==============================================================================
--- stable/10/usr.sbin/route6d/route6d.c	Sun Mar 23 16:49:03 2014	(r263667)
+++ stable/10/usr.sbin/route6d/route6d.c	Sun Mar 23 19:07:14 2014	(r263668)
@@ -64,9 +64,7 @@ static const char _rcsid[] = "$KAME: rou
 #include <sys/uio.h>
 #include <net/if.h>
 #include <net/if_var.h>
-#define	_KERNEL	1
 #include <net/route.h>
-#undef _KERNEL
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <netinet/ip6.h>