From owner-freebsd-current Fri Aug 16 10:14:15 2002 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 0159537B400 for ; Fri, 16 Aug 2002 10:14:09 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4541343E77 for ; Fri, 16 Aug 2002 10:14:08 -0700 (PDT) (envelope-from bright@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1192) id 1739CAE1EE; Fri, 16 Aug 2002 10:14:08 -0700 (PDT) Date: Fri, 16 Aug 2002 10:14:08 -0700 From: Alfred Perlstein To: David Wolfskill Cc: current@FreeBSD.ORG Subject: Re: World breakage in lib/libc/gen/disklabel.c; here's a patch Message-ID: <20020816171408.GP75574@elvis.mu.org> References: <200208161503.g7GF366M017636@bunrab.catwhisker.org> <200208161552.g7GFq1Vx017884@bunrab.catwhisker.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200208161552.g7GFq1Vx017884@bunrab.catwhisker.org> User-Agent: Mutt/1.3.27i Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG * David Wolfskill [020816 08:52] wrote: > >Date: Fri, 16 Aug 2002 08:03:06 -0700 (PDT) > >From: David Wolfskill > > >The following patch (from /usr/src) gets past the problem, but I > >don't know that it's correct: > > Still don't know about "correct," but it was incomplete. > > >Index: lib/libc/gen/disklabel.c > > After adding these patches to that one, I got world to build. > (Building kernel as I type, so I haven't booted the result, let alone > tested it.) Sorry, I'll have this committed soon. > > Index: sbin/disklabel/disklabel.c > =================================================================== > RCS file: /cvs/freebsd/src/sbin/disklabel/disklabel.c,v > retrieving revision 1.56 > diff -u -r1.56 disklabel.c > --- sbin/disklabel/disklabel.c 3 Jul 2002 16:43:11 -0000 1.56 > +++ sbin/disklabel/disklabel.c 16 Aug 2002 15:18:40 -0000 > @@ -60,6 +60,7 @@ > #include > #include > #include > +#define FSTYPENAMES > #define DKTYPENAMES > #include > #ifdef __sparc64__ > Index: sbin/fsck_ffs/setup.c > =================================================================== > RCS file: /cvs/freebsd/src/sbin/fsck_ffs/setup.c,v > retrieving revision 1.36 > diff -u -r1.36 setup.c > --- sbin/fsck_ffs/setup.c 16 Aug 2002 07:34:19 -0000 1.36 > +++ sbin/fsck_ffs/setup.c 16 Aug 2002 15:28:35 -0000 > @@ -39,6 +39,7 @@ > "$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.36 2002/08/16 07:34:19 alfred Exp $"; > #endif /* not lint */ > > +#define FSTYPENAMES > #include > #include > #include > > Cheers, > david (links to my resume at http://www.catwhisker.org/~david) > -- > David H. Wolfskill david@catwhisker.org > To paraphrase David Hilbert, there can be no conflicts between the > discipline of systems administration and Microsoft, since they have > nothing in common. -- -Alfred Perlstein [alfred@freebsd.org] [#bsdcode/efnet/irc.prison.net] 'Instead of asking why a piece of software is using "1970s technology," start asking why software is ignoring 30 years of accumulated wisdom.' To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message