From 99cc4c59c38965e276ca49a06e005ddd6ec34711 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 29 Nov 2015 15:46:01 +0100 Subject: [PATCH] (Apple) Buildfix --- input/drivers/apple_keycode.h | 4 +++- input/drivers/cocoa_input.c | 4 +--- input/drivers_keyboard/keyboard_event_apple.c | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/input/drivers/apple_keycode.h b/input/drivers/apple_keycode.h index c85f419e96..08d45a0f8a 100644 --- a/input/drivers/apple_keycode.h +++ b/input/drivers/apple_keycode.h @@ -160,6 +160,8 @@ enum KEY_RightGUI = 231 }; +#include + #include "../input_config.h" int16_t apple_input_is_pressed(unsigned port_num, @@ -167,7 +169,7 @@ int16_t apple_input_is_pressed(unsigned port_num, int16_t apple_keyboard_state(unsigned id); -void apple_keyboard_find_any_key(void); +int32_t apple_keyboard_find_any_key(void); void apple_keyboard_free(void); diff --git a/input/drivers/cocoa_input.c b/input/drivers/cocoa_input.c index 397044e47c..ab4e68a199 100644 --- a/input/drivers/cocoa_input.c +++ b/input/drivers/cocoa_input.c @@ -38,9 +38,7 @@ int32_t cocoa_input_find_any_key(void) if (apple->sec_joypad) apple->sec_joypad->poll(); - apple_keyboard_find_any_key(); - - return 0; + return apple_keyboard_find_any_key(); } static int cocoa_input_find_any_button_ret(cocoa_input_data_t *apple, diff --git a/input/drivers_keyboard/keyboard_event_apple.c b/input/drivers_keyboard/keyboard_event_apple.c index 80b122ba80..68cbde4c75 100644 --- a/input/drivers_keyboard/keyboard_event_apple.c +++ b/input/drivers_keyboard/keyboard_event_apple.c @@ -326,13 +326,15 @@ int16_t apple_keyboard_state(unsigned id) return (id < RETROK_LAST) && apple_key_state[bit]; } -void apple_keyboard_find_any_key(void) +int32_t apple_keyboard_find_any_key(void) { unsigned i; for (i = 0; apple_key_name_map[i].hid_id; i++) if (apple_key_state[apple_key_name_map[i].hid_id]) return apple_key_name_map[i].hid_id; + + return 0; } void apple_keyboard_free(void)