xserver: Branch 'server-1.5-branch'
Dave Airlie
airlied at kemper.freedesktop.org
Wed Jun 11 17:01:55 PDT 2008
hw/xfree86/os-support/bsd/bsd_init.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 53a84d75c65f75c629c6610a2ec4093507cea3f7
Author: Julien Cristau <jcristau at debian.org>
Date: Fri May 23 23:00:40 2008 +0200
xfree86: fix build on GNU/kFreeBSD
GNU/kFreeBSD defines __FreeBSD_kernel__, but not __FreeBSD__.
Unify preprocessor conditionals between variable declaration and use.
Debian bug #482550.
(cherry picked from commit e6cbb1e11e5da1a8b9001853c25f4e5a052e7110)
diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c
index 2c6a025..83583d5 100644
--- a/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/hw/xfree86/os-support/bsd/bsd_init.c
@@ -159,7 +159,7 @@ xf86OpenConsole()
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;
More information about the xorg-commit
mailing list