From 68481e894207678d2f35ca44cdaf726800caaffa Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 27 Sep 2015 00:11:13 +0200
Subject: [PATCH] Cleanups

---
 menu/menu_display.c | 20 +++++++++++++++++++-
 menu/menu_display.h | 21 ---------------------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/menu/menu_display.c b/menu/menu_display.c
index 598615d640..3cae71e155 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -31,11 +31,29 @@ typedef struct menu_framebuf
    bool dirty;
 } menu_framebuf_t;
 
+typedef struct menu_display
+{
+   bool msg_force;
+
+   struct
+   {
+      void *buf;
+      int size;
+
+      const uint8_t *framebuf;
+      bool alloc_framebuf;
+   } font;
+
+   unsigned header_height;
+
+   msg_queue_t *msg_queue;
+} menu_display_t;
+
 static menu_display_t  menu_display_state;
 
 static menu_framebuf_t frame_buf_state;
 
-menu_display_t *menu_display_get_ptr(void)
+static menu_display_t *menu_display_get_ptr(void)
 {
    return &menu_display_state;
 }
diff --git a/menu/menu_display.h b/menu/menu_display.h
index 71b8fb32cb..8f83c5bd5c 100644
--- a/menu/menu_display.h
+++ b/menu/menu_display.h
@@ -60,26 +60,6 @@ enum menu_display_ctl_state
    MENU_DISPLAY_CTL_SET_FONT_FB
 };
 
-typedef struct menu_display
-{
-   bool msg_force;
-
-   struct
-   {
-      void *buf;
-      int size;
-
-      const uint8_t *framebuf;
-      bool alloc_framebuf;
-   } font;
-
-   unsigned header_height;
-
-   msg_queue_t *msg_queue;
-} menu_display_t;
-
-menu_display_t  *menu_display_get_ptr(void);
-
 void menu_display_free(void);
 
 bool menu_display_init(void);
@@ -99,7 +79,6 @@ bool menu_display_init_main_font(void *data,
 
 void menu_display_free_main_font(void);
 
-
 bool menu_display_ctl(enum menu_display_ctl_state state, void *data);
 
 void menu_display_timedate(char *s, size_t len, unsigned time_mode);