> From: Tiago Vignatti <[email protected]> > Date: Sun, 2 May 2010 23:07:41 +0300 > > This is here since the initial revision but it's not synchronized with the > definitions in both xf86.h and xf86sbusBus.h
Huh? The extra declarations in xf86.h and xf86sbusBus.h are harmless, so your conclusion that these !defined(__OpenBSD__) clauses can go is flawed. If you really insist on synchronizing things, please adjust the headers. The reason for this !defined(__OpenBSD__) is that the code in xserver/hw/xfree86/common/xf86sbusBus.c is too OS-specific to be usable on OpenBSD. I have a (much simpler) OpenBSD-specific replacement for that code. I should probably talk to Matthieu to see how we can integrate that code nack upstream. Until that's take care of those !defined(__OpenBSD__) makes sure that official Xorg releases stand a chance to compile on OpenBSD/sparc and OpenBSD/sparc64. You won't be able to use the accelerated drivers for SBus and UPA grphics hardware, but PCI hardware and the unuaccelerated wsfb framebuffer driver should work fine. > Signed-off-by: Tiago Vignatti <[email protected]> Nacked-by: Mark Kettenis <[email protected]> > diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c > index 788de0b..7f30b18 100644 > --- a/hw/xfree86/common/xf86Bus.c > +++ b/hw/xfree86/common/xf86Bus.c > @@ -68,7 +68,7 @@ void > xf86BusProbe(void) > { > xf86PciProbe(); > -#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__) > +#if (defined(__sparc__) || defined(__sparc)) > xf86SbusProbe(); > #endif > } > @@ -481,7 +481,7 @@ void > xf86PostProbe(void) > { > if (fbSlotClaimed && (pciSlotClaimed > -#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__) > +#if (defined(__sparc__) || defined(__sparc)) > || sbusSlotClaimed > #endif > )) > -- > 1.6.0.4 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
