From 8a6333ddc163ec2e57f42cc5d649858b31234fb4 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 24 Sep 2015 21:23:16 +0200
Subject: [PATCH] Move defines around

---
 input/input_driver.h |  4 ++++
 menu/menu.h          |  1 +
 menu/menu_input.c    |  4 ++++
 menu/menu_input.h    | 18 +-----------------
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/input/input_driver.h b/input/input_driver.h
index a7afd2565f..2071891a17 100644
--- a/input/input_driver.h
+++ b/input/input_driver.h
@@ -29,6 +29,10 @@
 #include "input_overlay.h"
 #endif
 
+#ifndef MAX_USERS
+#define MAX_USERS 16
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/menu/menu.h b/menu/menu.h
index 741588a34b..dd72c5d07f 100644
--- a/menu/menu.h
+++ b/menu/menu.h
@@ -25,6 +25,7 @@
 #include <boolean.h>
 
 #include "../driver.h"
+#include "../input/input_driver.h"
 #include "../dynamic.h"
 
 #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
diff --git a/menu/menu_input.c b/menu/menu_input.c
index 6b2ac75ca2..771a26fcd4 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
+
 unsigned bind_port;
 
 struct menu_bind_state_port
diff --git a/menu/menu_input.h b/menu/menu_input.h
index daacbdfa44..38206e654c 100644
--- a/menu/menu_input.h
+++ b/menu/menu_input.h
@@ -25,22 +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
-
 typedef enum menu_action
 {
    MENU_ACTION_UP,
@@ -86,7 +70,7 @@ enum menu_ctl_state
    MENU_CTL_POINTER_DRAGGING,
    MENU_CTL_KEYBOARD_DISPLAY,
    MENU_CTL_KEYBOARD_BUFF_PTR,
-   MENU_CTL_KEYBOARD_LABEL,
+   MENU_CTL_KEYBOARD_LABEL
 };
 
 enum mouse_action