From 80efc1339e6a1d2c9293e20a8b0fbc79ffbbfe81 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 24 Sep 2015 14:16:16 +0200
Subject: [PATCH] Revert "Cleanups"

This reverts commit 32bbf71bbbe577a4556018ffa45d5d52028e21ce.
---
 menu/menu_driver.h | 3 ++-
 menu/menu_input.h  | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 2df5bbe300..a6944cd350 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -21,6 +21,7 @@
 #include <stdint.h>
 #include <boolean.h>
 #include <retro_miscellaneous.h>
+#include "menu_input.h"
 #include "menu_animation.h"
 #include "menu_display.h"
 #include "menu_displaylist.h"
@@ -109,7 +110,7 @@ typedef struct
    char default_cgp[PATH_MAX_LENGTH];
    struct video_shader *shader;
 
-   void *input;
+   menu_input_t *input;
 
    content_playlist_t *playlist;
    char db_playlist_file[PATH_MAX_LENGTH];
diff --git a/menu/menu_input.h b/menu/menu_input.h
index a4f5f9340e..28cec21562 100644
--- a/menu/menu_input.h
+++ b/menu/menu_input.h
@@ -93,6 +93,8 @@ enum menu_input_bind_mode
    MENU_INPUT_BIND_ALL
 };
 
+typedef struct menu_input menu_input_t;
+
 void menu_input_key_event(bool down, unsigned keycode, uint32_t character,
       uint16_t key_modifiers);