From abf7a80f277eec045c952974beb98d3759eb62b8 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 9 Jul 2015 07:48:56 +0200 Subject: [PATCH] (Android) Buildfixes and remove unused variable warnings --- input/drivers/android_input.c | 8 ++++---- libretro_version_1.c | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c index afe664c6c7..2fd9a316c5 100644 --- a/input/drivers/android_input.c +++ b/input/drivers/android_input.c @@ -914,14 +914,14 @@ static int16_t android_input_state(void *data, static bool android_input_key_pressed(void *data, int key) { android_input_t *android = (android_input_t*)data; - driver_t *driver = driver_get_ptr(); - settings_t *settings = config_get_ptr(); + input_overlay_state_t *ol_state = input_overlay_get_state_ptr(); + settings_t *settings = config_get_ptr(); if (!android) return false; - return (driver->overlay_state.buttons - & (1ULL << key)) || input_joypad_pressed(android->joypad, + return (ol_state && (ol_state->buttons + & (1ULL << key))) || input_joypad_pressed(android->joypad, 0, settings->input.binds[0], key); } diff --git a/libretro_version_1.c b/libretro_version_1.c index 952f598a8a..5a7e1b4774 100644 --- a/libretro_version_1.c +++ b/libretro_version_1.c @@ -248,7 +248,6 @@ static INLINE void input_poll_overlay( unsigned i, j, device; uint16_t key_mod = 0; bool polled = false; - driver_t *driver = driver_get_ptr(); settings_t *settings = config_get_ptr(); input_overlay_state_t *ol_state = input_overlay_get_state_ptr(); @@ -386,6 +385,8 @@ static void input_poll(void) input_driver_poll(); + (void)driver; + #ifdef HAVE_OVERLAY if (overlay) input_poll_overlay(overlay,