From owner-svn-src-all@FreeBSD.ORG  Thu Jan  9 22:41:18 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-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 BD450B04;
 Thu,  9 Jan 2014 22:41:18 +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 A9B9C1706;
 Thu,  9 Jan 2014 22:41:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s09MfI9X074085;
 Thu, 9 Jan 2014 22:41:18 GMT (envelope-from jmg@svn.freebsd.org)
Received: (from jmg@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s09MfI3A074084;
 Thu, 9 Jan 2014 22:41:18 GMT (envelope-from jmg@svn.freebsd.org)
Message-Id: <201401092241.s09MfI3A074084@svn.freebsd.org>
From: John-Mark Gurney <jmg@FreeBSD.org>
Date: Thu, 9 Jan 2014 22:41:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260496 - head/sys/netinet6
X-SVN-Group: head
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: Thu, 09 Jan 2014 22:41:18 -0000

Author: jmg
Date: Thu Jan  9 22:41:18 2014
New Revision: 260496
URL: http://svnweb.freebsd.org/changeset/base/260496

Log:
  revert part of r260485 which changes how part of the header gets
  included..  netstat uses -DKERNEL=1 to get these parts and breaks the
  build w/o it...
  
  melifaro@ says that ae@ is probably asleep, and the PR doesn't have
  this part of the patch...  Probably a local change got in by accident..
  
  PR:		185148
  Pointy hat to:	ae@

Modified:
  head/sys/netinet6/ip6_mroute.h

Modified: head/sys/netinet6/ip6_mroute.h
==============================================================================
--- head/sys/netinet6/ip6_mroute.h	Thu Jan  9 22:40:51 2014	(r260495)
+++ head/sys/netinet6/ip6_mroute.h	Thu Jan  9 22:41:18 2014	(r260496)
@@ -194,7 +194,7 @@ struct sioc_mif_req6 {
 	u_quad_t obytes;	/* Output byte count on mif		*/
 };
 
-#ifdef _KERNEL
+#if defined(_KERNEL) || defined(KERNEL)
 /*
  * The kernel's multicast-interface structure.
  */