From 53277e3b1c21f1cdfa13940429a43b02b51a9114 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 29 Nov 2015 16:28:55 +0100 Subject: [PATCH] Remove more HAVE_COCOA ifdefs --- input/drivers_keyboard/keyboard_event_apple.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/input/drivers_keyboard/keyboard_event_apple.c b/input/drivers_keyboard/keyboard_event_apple.c index aef9c88930..25686fde5d 100644 --- a/input/drivers_keyboard/keyboard_event_apple.c +++ b/input/drivers_keyboard/keyboard_event_apple.c @@ -28,16 +28,9 @@ #if TARGET_OS_IPHONE static bool small_keyboard_active; -#endif - -static uint32_t apple_key_state[MAX_KEYS]; - -#if defined(HAVE_COCOATOUCH) #define HIDKEY(X) X - -#elif defined(HAVE_COCOA) - +#else /* Taken from https://github.com/depp/keycode, * check keycode.h for license. */ @@ -55,6 +48,8 @@ static const unsigned char MAC_NATIVE_TO_HID[128] = { #define HIDKEY(X) (X < 128) ? MAC_NATIVE_TO_HID[X] : 0 #endif +static uint32_t apple_key_state[MAX_KEYS]; + #if TARGET_OS_IPHONE static bool handle_small_keyboard(unsigned* code, bool down) {