Commit 1ccbad960364f3a3af7880740c7b9658638ee104
2013-09-28T15:48:32
Do not use UDEV references in EVDEV if UDEV has not been detected
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
diff --git a/src/input/evdev/SDL_evdev.c b/src/input/evdev/SDL_evdev.c
index ea911d6..99b9949 100644
--- a/src/input/evdev/SDL_evdev.c
+++ b/src/input/evdev/SDL_evdev.c
@@ -53,12 +53,14 @@ static _THIS = NULL;
#define SYN_DROPPED 3
#endif
+static SDL_Scancode SDL_EVDEV_translate_keycode(int keycode);
+static void SDL_EVDEV_sync_device(SDL_evdevlist_item *item);
+#if SDL_USE_LIBUDEV
static int SDL_EVDEV_device_removed(const char *devpath);
static int SDL_EVDEV_device_added(const SDL_UDEV_deviceclass devclass, const char *devpath);
-static SDL_Scancode SDL_EVDEV_translate_keycode(int keycode);
-static void SDL_EVDEV_sync_device(SDL_evdevlist_item *item);
void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_type, SDL_UDEV_deviceclass udev_class, const char *devpath);
+#endif /* SDL_USE_LIBUDEV */
static SDL_Scancode EVDEV_Keycodes[] = {
SDL_SCANCODE_UNKNOWN, /* KEY_RESERVED 0 */
@@ -390,6 +392,7 @@ SDL_EVDEV_Quit(void)
}
}
+#if SDL_USE_LIBUDEV
void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_type, SDL_UDEV_deviceclass udev_class, const char *devpath)
{
SDL_EVDEV_deviceclass devclass;
@@ -429,6 +432,8 @@ void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_type, SDL_UDEV_deviceclas
}
+#endif /* SDL_USE_LIBUDEV */
+
void
SDL_EVDEV_Poll(void)
{
@@ -562,6 +567,7 @@ SDL_EVDEV_sync_device(SDL_evdevlist_item *item)
/* TODO: get full state of device and report whatever is required */
}
+#if SDL_USE_LIBUDEV
static int
SDL_EVDEV_device_added(const SDL_UDEV_deviceclass devclass, const char *devpath)
{
@@ -640,6 +646,7 @@ SDL_EVDEV_device_removed(const char *devpath)
return -1;
}
+#endif /* SDL_USE_LIBUDEV */
#endif /* SDL_INPUT_LINUXEV */