From 5eb593083820ae6195d140eb2ca63bbc729a513c Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 22 Jul 2019 20:31:53 +0200
Subject: [PATCH] Cleanups

---
 driver.h    | 27 ---------------------------
 retroarch.c | 31 +++++++++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/driver.h b/driver.h
index 258fec2c25..a4908c6d73 100644
--- a/driver.h
+++ b/driver.h
@@ -26,29 +26,6 @@
 
 RETRO_BEGIN_DECLS
 
-#define DRIVERS_CMD_ALL \
-      ( DRIVER_AUDIO_MASK \
-      | DRIVER_VIDEO_MASK \
-      | DRIVER_INPUT_MASK \
-      | DRIVER_CAMERA_MASK \
-      | DRIVER_LOCATION_MASK \
-      | DRIVER_MENU_MASK \
-      | DRIVERS_VIDEO_INPUT_MASK \
-      | DRIVER_WIFI_MASK \
-      | DRIVER_LED_MASK \
-      | DRIVER_MIDI_MASK )
-
-#define DRIVERS_CMD_ALL_BUT_MENU \
-      ( DRIVER_AUDIO_MASK \
-      | DRIVER_VIDEO_MASK \
-      | DRIVER_INPUT_MASK \
-      | DRIVER_CAMERA_MASK \
-      | DRIVER_LOCATION_MASK \
-      | DRIVERS_VIDEO_INPUT_MASK \
-      | DRIVER_WIFI_MASK \
-      | DRIVER_LED_MASK \
-      | DRIVER_MIDI_MASK )
-
 enum
 {
    DRIVER_AUDIO = 0,
@@ -115,10 +92,6 @@ bool driver_ctl(enum driver_ctl_state state, void *data);
  * audio and video drivers instead. */
 void driver_set_nonblock_state(void);
 
-void driver_uninit(int flags);
-
-void drivers_init(int flags);
-
 RETRO_END_DECLS
 
 #endif
diff --git a/retroarch.c b/retroarch.c
index 1154b87178..bf65e73413 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -209,6 +209,31 @@
 
 /* DRIVERS */
 
+#define DRIVERS_CMD_ALL \
+      ( DRIVER_AUDIO_MASK \
+      | DRIVER_VIDEO_MASK \
+      | DRIVER_INPUT_MASK \
+      | DRIVER_CAMERA_MASK \
+      | DRIVER_LOCATION_MASK \
+      | DRIVER_MENU_MASK \
+      | DRIVERS_VIDEO_INPUT_MASK \
+      | DRIVER_WIFI_MASK \
+      | DRIVER_LED_MASK \
+      | DRIVER_MIDI_MASK )
+
+#define DRIVERS_CMD_ALL_BUT_MENU \
+      ( DRIVER_AUDIO_MASK \
+      | DRIVER_VIDEO_MASK \
+      | DRIVER_INPUT_MASK \
+      | DRIVER_CAMERA_MASK \
+      | DRIVER_LOCATION_MASK \
+      | DRIVERS_VIDEO_INPUT_MASK \
+      | DRIVER_WIFI_MASK \
+      | DRIVER_LED_MASK \
+      | DRIVER_MIDI_MASK )
+
+
+
 static const audio_driver_t *audio_drivers[] = {
 #ifdef HAVE_ALSA
    &audio_alsa,
@@ -1634,6 +1659,8 @@ static char *secondary_library_path                = NULL;
 #endif
 
 /* Forward declarations */
+static void driver_uninit(int flags);
+static void drivers_init(int flags);
 static void core_free_retro_game_info(struct retro_game_info *dest);
 static void core_uninit_symbols(void);
 static bool core_unload(void);
@@ -19609,7 +19636,7 @@ bool audio_driver_new_devices_list(void)
  * Initializes drivers.
  * @flags determines which drivers get initialized.
  **/
-void drivers_init(int flags)
+static void drivers_init(int flags)
 {
    bool video_is_threaded = false;
    settings_t *settings   = configuration_settings;
@@ -19755,7 +19782,7 @@ void drivers_init(int flags)
  * Typically, if a driver intends to make use of this, it should
  * set this to true at the end of its 'init' function.
  **/
-void driver_uninit(int flags)
+static void driver_uninit(int flags)
 {
    core_info_deinit_list();
    core_info_free_current_core();