The attached patch was originally reported in bug #66045 Reposting here on request of Peter Hutterer.
-- Francois Tigeot
>From 09bb2339b04d2cf7facad22ca4177a247b264563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Tigeot?= <[email protected]> Date: Sat, 22 Jun 2013 09:06:27 +0200 Subject: [PATCH] Fix mouse header include on DragonFly and FreeBSD * __FreeBSD_kernel_version doesn't exist anymore * The removed check was for FreeBSD versions from before September 2000 which are no longer supported anyway --- hw/xfree86/os-support/xf86_OSlib.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h index e931b09..eb0a338 100644 --- a/hw/xfree86/os-support/xf86_OSlib.h +++ b/hw/xfree86/os-support/xf86_OSlib.h @@ -277,12 +277,7 @@ struct pcvtid { #include <dev/wscons/wsdisplay_usl_io.h> #endif /* WSCONS_SUPPORT */ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -#if defined(__FreeBSD_kernel_version) && (__FreeBSD_kernel_version >= 500013) #include <sys/mouse.h> -#else -#undef MOUSE_GETINFO -#include <machine/mouse.h> -#endif #endif /* Include these definitions in case ioctl_pc.h didn't get included */ #ifndef CONSOLE_X_MODE_ON -- 1.8.2.3
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
