From 7a5f2228aa1ac49a10d2eb0937b7bb9aa72ca1fc Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 24 Sep 2015 13:25:53 +0200 Subject: [PATCH] Move enums to menu_input.c --- menu/menu_input.c | 4 ++++ menu/menu_input.h | 12 ------------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/menu/menu_input.c b/menu/menu_input.c index 27c9a6d9d5..844259bebe 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -39,6 +39,10 @@ #include "../input/input_remapping.h" #include "../input/input_common.h" +#define MENU_MAX_BUTTONS 219 +#define MENU_MAX_AXES 32 +#define MENU_MAX_HATS 4 + struct menu_bind_state_port { bool buttons[MENU_MAX_BUTTONS]; diff --git a/menu/menu_input.h b/menu/menu_input.h index 50b581df91..eaae5a8d45 100644 --- a/menu/menu_input.h +++ b/menu/menu_input.h @@ -25,18 +25,6 @@ extern "C" { #endif -#ifndef MENU_MAX_BUTTONS -#define MENU_MAX_BUTTONS 219 -#endif - -#ifndef MENU_MAX_AXES -#define MENU_MAX_AXES 32 -#endif - -#ifndef MENU_MAX_HATS -#define MENU_MAX_HATS 4 -#endif - #ifndef MAX_USERS #define MAX_USERS 16 #endif