From: <ebo...@us...> - 2003-01-30 14:18:42
|
Update of /cvsroot/alleg/allegro/src/linux In directory sc8-pr-cvs1:/tmp/cvs-serv19055/src/linux Modified Files: lmsedrv.c lmseev.c Log Message: Vincent fixed the compilation breakage on Linux kernels 2.2.x Index: lmsedrv.c =================================================================== RCS file: /cvsroot/alleg/allegro/src/linux/lmsedrv.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- lmsedrv.c 23 Jan 2003 16:22:56 -0000 1.5 +++ lmsedrv.c 30 Jan 2003 14:18:38 -0000 1.6 @@ -28,7 +28,9 @@ { MOUSEDRV_LINUX_IMS, &mousedrv_linux_ims, TRUE }, { MOUSEDRV_LINUX_PS2, &mousedrv_linux_ps2, TRUE }, { MOUSEDRV_LINUX_IPS2, &mousedrv_linux_ips2, TRUE }, +#ifdef HAVE_LINUX_INPUT_H { MOUSEDRV_LINUX_EVDEV, &mousedrv_linux_evdev, TRUE }, +#endif { MOUSEDRV_NONE, &mousedrv_none, TRUE }, { 0, NULL, 0 } }; Index: lmseev.c =================================================================== RCS file: /cvsroot/alleg/allegro/src/linux/lmseev.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- lmseev.c 23 Jan 2003 16:58:29 -0000 1.2 +++ lmseev.c 30 Jan 2003 14:18:38 -0000 1.3 @@ -26,17 +26,20 @@ */ -#include <stdio.h> -#include <sys/ioctl.h> -#include <linux/input.h> - -/* linux/input.h also define KEY_A, etc. Just like Allegro :( */ +/* linux/input.h also defines KEY_A et al. */ #define ALLEGRO_NO_KEY_DEFINES #include "allegro.h" + +#ifdef HAVE_LINUX_INPUT_H + #include "allegro/internal/aintern.h" #include "allegro/platform/aintunix.h" #include "linalleg.h" +#include <stdio.h> +#include <sys/ioctl.h> +#include <linux/input.h> + /* @@ -661,4 +664,6 @@ mouse_get_mickeys, analyse_data }; + +#endif |