[PATCH] Fix mouse header include on DragonFly and FreeBSD

[Peter Hutterer]

On Mon, Jul 15, 2013 at 10:07:23PM +0200, Francois Tigeot wrote:
> On Mon, Jul 01, 2013 at 11:40:00AM +0200, Francois Tigeot wrote:
> > The attached patch was originally reported in bug #66045
> 
> New version with Signed-off-by: tag.
> 
> -- 
> Francois Tigeot

> From 5985f14314ee6367ad1060b4045b41f63e3a518a Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Fran=C3=A7ois=20Tigeot?= <ftigeot at wolfpond.org>
> Date: Mon, 15 Jul 2013 21:54:26 +0200
> Subject: [PATCH] Fix mouse header include on DragonFly and FreeBSD
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
> 
> *  __FreeBSD_kernel_version doesn't exist anymore
> 
> * The removed check was for FreeBSD versions from before September 2000
>   which are no longer supported anyway
> 
> * Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=66045
> 
> Signed-off-by: François Tigeot <ftigeot at wolfpond.org>
> ---
>  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.3.1
 
Thanks, I've merged this into my repo and it'll be available with my next
pull request.

Cheers,
   Peter