Date: Fri, 16 Aug 2002 08:52:01 -0700 (PDT) From: David Wolfskill <david@catwhisker.org> To: current@FreeBSD.ORG Cc: alfred@FreeBSD.ORG Subject: Re: World breakage in lib/libc/gen/disklabel.c; here's a patch Message-ID: <200208161552.g7GFq1Vx017884@bunrab.catwhisker.org> In-Reply-To: <200208161503.g7GF366M017636@bunrab.catwhisker.org>
next in thread | previous in thread | raw e-mail | index | archive | help
>Date: Fri, 16 Aug 2002 08:03:06 -0700 (PDT) >From: David Wolfskill <david@catwhisker.org> >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.) 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 <sys/file.h> #include <sys/stat.h> #include <sys/wait.h> +#define FSTYPENAMES #define DKTYPENAMES #include <sys/disklabel.h> #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 <sys/param.h> #include <sys/stat.h> #include <sys/disklabel.h> 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. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200208161552.g7GFq1Vx017884>