Buildkernel broken

[David Wolfskill]

>Date: Tue, 27 May 2003 12:17:18 -0400
>From: "Will Saxon" <WillS at housing.ufl.edu>

>> I cvsupped the source this morning and I get:

>> [...]
>> ===> firewire/firewire
>> ...
>> In file included from /usr/src/sys/dev/firewire/fwohci.c:72:
>> @/dev/firewire/fwdma.h:38: redefinition of `bus_dmasync_op_t'
>> machine/bus_dma.h:94: `bus_dmasync_op_t' previously declared here
>> *** Error code 1

>> [...]

>I have the exact same problem. I think it has something to do with a commit from this morning.

>I commented out the offending #define in fwdma.h and the module compiles fine now.

I decided to go ahead and hack the code a bit (on my tree); the
following patch (relaative to /usr/src) seems to work for me:

Index: sys/dev/firewire/fwdma.h
===================================================================
RCS file: /cvs/freebsd/src/sys/dev/firewire/fwdma.h,v
retrieving revision 1.1
diff -u -r1.1 fwdma.h
--- sys/dev/firewire/fwdma.h	17 Apr 2003 03:38:02 -0000	1.1
+++ sys/dev/firewire/fwdma.h	27 May 2003 16:14:57 -0000
@@ -34,7 +34,7 @@
  * $FreeBSD: src/sys/dev/firewire/fwdma.h,v 1.1 2003/04/17 03:38:02 simokawa Exp $
  */
 
-#if __FreeBSD_version >= 500111
+#if (__FreeBSD_version >= 500111) && (__FreeBSD_version < 500113)
 typedef int bus_dmasync_op_t;
 #endif
 

Peace,
david
-- 
David H. Wolfskill				david at catwhisker.org
Based on what I have seen to date, the use of Microsoft products is not
consistent with reliability.  I recommend FreeBSD for reliable systems.