From 24dd7409bcafdf8cca6060565f27284042839a59 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 20 May 2020 03:58:36 +0200
Subject: [PATCH] Move more global variables and forward declarations up top

---
 retroarch.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/retroarch.c b/retroarch.c
index 32faf7470f..2bce56b866 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1973,6 +1973,8 @@ static char *secondary_library_path                = NULL;
 static int g_ai_service_auto = 0;
 #endif
 
+static unsigned gamepad_input_override = 0;
+
 /* Forward declarations */
 static void retroarch_core_options_intl_init(const struct 
       retro_core_options_intl *core_options_intl);
@@ -2040,6 +2042,15 @@ static void retroarch_overlay_init(void);
 static void retroarch_overlay_deinit(void);
 #endif
 
+#ifdef HAVE_AUDIOMIXER
+static void audio_mixer_play_stop_sequential_cb(
+      audio_mixer_sound_t *sound, unsigned reason);
+static void audio_mixer_play_stop_cb(
+      audio_mixer_sound_t *sound, unsigned reason);
+static void audio_mixer_menu_stop_cb(
+      audio_mixer_sound_t *sound, unsigned reason);
+#endif
+
 static void video_driver_gpu_record_deinit(void);
 static retro_proc_address_t video_driver_get_proc_address(const char *sym);
 static uintptr_t video_driver_get_current_framebuffer(void);
@@ -19046,15 +19057,6 @@ size_t midi_driver_get_event_size(uint8_t status)
 
 /* AUDIO */
 
-#ifdef HAVE_AUDIOMIXER
-static void audio_mixer_play_stop_sequential_cb(
-      audio_mixer_sound_t *sound, unsigned reason);
-static void audio_mixer_play_stop_cb(
-      audio_mixer_sound_t *sound, unsigned reason);
-static void audio_mixer_menu_stop_cb(
-      audio_mixer_sound_t *sound, unsigned reason);
-#endif
-
 static enum resampler_quality audio_driver_get_resampler_quality(void)
 {
    settings_t *settings    = configuration_settings;
@@ -24596,7 +24598,6 @@ static void mylist_destroy(MyList **list_p)
    }
 }
 
-
 static void mylist_create(MyList **list_p, int initial_capacity,
       constructor_t constructor, destructor_t destructor)
 {
@@ -29676,9 +29677,6 @@ static bool accessibility_startup_message(void)
    return true;
 }
 
-
-static unsigned gamepad_input_override = 0;
-
 unsigned get_gamepad_input_override(void)
 {
    return gamepad_input_override;