From efe3ff1b9120ab3cc251dfd4ebf69ee1e315b3e6 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Wed, 16 Jun 2004 23:37:38 +0000 Subject: [PATCH] put BTN_{WHEEL,GEAR_DOWN,GEAR_UP} usage in #ifdefs, since pre-2.6 kernels 2004-06-16 Manish Singh * modules/controller_linux_input.c: put BTN_{WHEEL,GEAR_DOWN,GEAR_UP} usage in #ifdefs, since pre-2.6 kernels do not have them. * modules/controller_linux_input.c (linux_input_read_event): n_bytes should be a gsize. --- ChangeLog | 8 ++++++++ modules/controller_linux_input.c | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3366c8d251..a3ceb26f19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-06-16 Manish Singh + + * modules/controller_linux_input.c: put BTN_{WHEEL,GEAR_DOWN,GEAR_UP} + usage in #ifdefs, since pre-2.6 kernels do not have them. + + * modules/controller_linux_input.c (linux_input_read_event): n_bytes + should be a gsize. + 2004-06-16 Michael Natterer * app/actions/context-actions.c diff --git a/modules/controller_linux_input.c b/modules/controller_linux_input.c index b37838546a..33cdfe807a 100644 --- a/modules/controller_linux_input.c +++ b/modules/controller_linux_input.c @@ -67,9 +67,15 @@ static const LinuxInputEvent key_events[] = { BTN_EXTRA, "button-extra", N_("Button Extra") }, { BTN_FORWARD, "button-forward", N_("Button Forward") }, { BTN_BACK, "button-back", N_("Button Forward") }, +#ifdef BTN_WHEEL { BTN_WHEEL, "button-wheel", N_("Button Wheel") }, +#endif +#ifdef BTN_GEAR_DOWN { BTN_GEAR_DOWN, "button-gear-down", N_("Button Gear Down") }, +#endif +#ifdef BTN_GEAR_UP { BTN_GEAR_UP, "button-gear-up", N_("Button Gear Up") } +#endif }; static const LinuxInputEvent rel_events[] = @@ -378,7 +384,7 @@ linux_input_read_event (GIOChannel *io, gpointer data) { struct input_event ev; - gint n_bytes; + gsize n_bytes; gint i; if (g_io_channel_read_chars (io,