From owner-freebsd-current Thu Jan 29 06:03:27 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id GAA12054 for current-outgoing; Thu, 29 Jan 1998 06:03:27 -0800 (PST) (envelope-from owner-freebsd-current@FreeBSD.ORG) Received: from ren.dtir.qld.gov.au (firewall-user@ns.dtir.qld.gov.au [203.108.138.66]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id GAA12049 for ; Thu, 29 Jan 1998 06:03:24 -0800 (PST) (envelope-from syssgm@dtir.qld.gov.au) Received: by ren.dtir.qld.gov.au; id AAA05192; Fri, 30 Jan 1998 00:24:06 +1000 (EST) Received: from ogre.dtir.qld.gov.au(167.123.8.3) by ren.dtir.qld.gov.au via smap (3.2) id xma005186; Fri, 30 Jan 98 00:23:50 +1000 Received: from troll.dtir.qld.gov.au (troll.dtir.qld.gov.au [167.123.8.1]) by ogre.dtir.qld.gov.au (8.8.7/8.8.7) with ESMTP id AAA01454; Fri, 30 Jan 1998 00:01:05 +1000 (EST) Received: from localhost (syssgm@localhost) by troll.dtir.qld.gov.au (8.8.5/8.8.5) with SMTP id AAA12197; Fri, 30 Jan 1998 00:01:01 +1000 (EST) Message-Id: <199801291401.AAA12197@troll.dtir.qld.gov.au> X-Authentication-Warning: troll.dtir.qld.gov.au: syssgm@localhost didn't use HELO protocol To: Matt Thomas cc: freebsd-current@FreeBSD.ORG, syssgm@dtir.qld.gov.au Subject: Re: PATCH: if_de.c #ifdef based version encoding References: <34CE4438.15FB7483@whistle.com> <199801271101.DAA25275@implode.root.com> <34CE4438.15FB7483@whistle.com> <199801280243.VAA17410@tecumseh.altavista-software.com> In-Reply-To: <199801280243.VAA17410@tecumseh.altavista-software.com> from Matt Thomas at "Tue, 27 Jan 1998 21:41:32 -0500" Date: Fri, 30 Jan 1998 00:01:00 +1000 From: Stephen McKay Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG X-To-Unsubscribe: mail to majordomo@FreeBSD.org "unsubscribe current" On Tuesday, 27th January 1998, Matt Thomas wrote: [ Regarding version conditionals in if_de.c ] >>Making Matt's life difficult would be counterproductive, but these version >>tests are pretty silly from an ivory tower purist view, and are also a pain >>in practice. I'm with Terry on this one. > >If there is such a symbol on 2.1.0 or later I'll use it. In the FreeBSD CVS tree, if_de.c is very different in 2.1.x, 2.2.x and 3.0. Discussions so far imply that you (Matt) intend that your version of if_de.c should run on all FreeBSD releases. In practice, the code is tweaked for changing local conditions (ie local to a branch), including mods for stuff like devconf (deceased) and XNS. In fact, all the conditionals that are bothering Terry (and me) are found only in the 3.0 branch and date from rev 1.65 on 1997/06/22. I don't know if you've ever seen these changes; they have not appeared in the more recent snapshots of your if_de.c that have been merged into the FreeBSD one. So, I don't think it is a matter of supplying you with a symbol to examine. The real question is whether or not all FreeBSD branches should be (nearly) identical (and therefore #ifdef festooned), or whether they should be quite different, but cleaner. Since we've "done it to ourselves", can't we just zap the backward compatibility stuff in the 3.0 branch? Stephen. PS It's quite educational to grovel round in the CVS logs diffing things!