Bug#482550: xorg-server/experimental: FTBFS on kfreebsd

[Julien Cristau <jcristau@debian.org>]

On Fri, May 23, 2008 at 15:32:34 +0200, Julien Cristau wrote:

> ../../../../../hw/xfree86/os-support/bsd/bsd_init.c: In function 'xf86OpenConsole':
> ../../../../../hw/xfree86/os-support/bsd/bsd_init.c:249: error: 'uts' undeclared (first use in this function)
> ../../../../../hw/xfree86/os-support/bsd/bsd_init.c:249: error: (Each undeclared identifier is reported only once
> ../../../../../hw/xfree86/os-support/bsd/bsd_init.c:249: error: for each function it appears in.)
> make[6]: *** [bsd_init.lo] Error 1
> 
With a trivial patch (put the variable declaration under the same
preprocessor conditional as its use):

--- xorg-server-1.4.99.902/hw/xfree86/os-support/bsd/bsd_init.c.orig    2008-05-23 15:39:20.000000000 +0200
+++ xorg-server-1.4.99.902/hw/xfree86/os-support/bsd/bsd_init.c 2008-05-23 15:40:47.000000000 +0200
@@ -159,7 +159,7 @@
     xf86ConsOpen_t *driver;
 #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
     int result;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
     struct utsname uts;
 #endif
     vtmode_t vtmode;

Cheers,
Julien