From owner-freebsd-current@FreeBSD.ORG  Tue Feb 14 22:27:30 2006
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
X-Original-To: freebsd-current@freebsd.org
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0B4AC16A420
	for <freebsd-current@freebsd.org>; Tue, 14 Feb 2006 22:27:30 +0000 (GMT)
	(envelope-from sgk@troutmask.apl.washington.edu)
Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu
	[128.208.78.105])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7F69E43D48
	for <freebsd-current@freebsd.org>; Tue, 14 Feb 2006 22:27:29 +0000 (GMT)
	(envelope-from sgk@troutmask.apl.washington.edu)
Received: from troutmask.apl.washington.edu (localhost [127.0.0.1])
	by troutmask.apl.washington.edu (8.13.4/8.13.4) with ESMTP id
	k1EMRTQ6028186
	for <freebsd-current@freebsd.org>; Tue, 14 Feb 2006 14:27:29 -0800 (PST)
	(envelope-from sgk@troutmask.apl.washington.edu)
Received: (from sgk@localhost)
	by troutmask.apl.washington.edu (8.13.4/8.13.1/Submit) id
	k1EMRSUc028177
	for freebsd-current@freebsd.org; Tue, 14 Feb 2006 14:27:28 -0800 (PST)
	(envelope-from sgk)
Date: Tue, 14 Feb 2006 14:27:28 -0800
From: Steve Kargl <sgk@troutmask.apl.washington.edu>
To: freebsd-current@freebsd.org
Message-ID: <20060214222728.GA26432@troutmask.apl.washington.edu>
References: <20060214220119.GA99615@troutmask.apl.washington.edu>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20060214220119.GA99615@troutmask.apl.washington.edu>
User-Agent: Mutt/1.4.2.1i
Subject: Re: Buildworld broken on amd64
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Feb 2006 22:27:30 -0000

On Tue, Feb 14, 2006 at 02:01:19PM -0800, Steve Kargl wrote:
> cc -O2 -fno-strict-aliasing -pipe -march=opteron -Wall -Wmissing-prototypes -Wcast-qual -Wwrite
> -strings -Wnested-externs -DRESCUE  -c /usr/src/sbin/ifconfig/ifmedia.c
> /usr/src/sbin/ifconfig/ifmedia.c:345: error: `IFM_10GBASE_SR' undeclared here (not in a functio

Sigh.  It was a gratuitious change of a name in a header file
where the committer obviously did no testing.

--- if_media.h.orig     Tue Feb 14 14:25:37 2006
+++ if_media.h  Tue Feb 14 14:25:54 2006
@@ -328,8 +328,8 @@
        { IFM_1000_T,   "1000baseTX" },                                 \
        { IFM_1000_T,   "1000baseT" },                                  \
        { IFM_HPNA_1,   "homePNA" },                                    \
-       { IFM_10GBASE_SR, "10GBASE-SR" },                               \
-       { IFM_10GBASE_LR, "10GBASE-LR" },                               \
+       { IFM_10G_SR, "10GBASE-SR" },                           \
+       { IFM_10G_LR, "10GBASE-LR" },                           \
        { 0, NULL },                                                    \
 }


-- 
Steve