From 85d18b77d8439fbf47cacb93ffc74002f6f2f17c Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 6 Oct 2013 15:00:26 +0000
Subject: [PATCH] (RARCH_CONSOLE) Include rgui->libretro_dir for RARCH_CONSOLE
 - Get rid of 'bypasses initialization of' warnings/errors

---
 core_info.c                 | 3 ++-
 file_extract.c              | 9 ++++++---
 frontend/menu/menu_common.h | 2 --
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/core_info.c b/core_info.c
index 5be6ade2dd..099ef0841c 100644
--- a/core_info.c
+++ b/core_info.c
@@ -27,6 +27,7 @@
 core_info_list_t *core_info_list_new(const char *modules_path)
 {
    struct string_list *contents = dir_list_new(modules_path, EXT_EXECUTABLES, false);
+   size_t all_ext_len;
 
    core_info_t *core_info = NULL;
    core_info_list_t *core_info_list = NULL;
@@ -78,7 +79,7 @@ core_info_list_t *core_info_list_new(const char *modules_path)
          core_info[i].display_name = strdup(path_basename(core_info[i].path));
    }
 
-   size_t all_ext_len = 0;
+   all_ext_len = 0;
    for (size_t i = 0; i < core_info_list->count; i++)
    {
       all_ext_len += core_info_list->list[i].supported_extensions ?
diff --git a/file_extract.c b/file_extract.c
index 3bb8dfbd47..5a1f7c0dcb 100644
--- a/file_extract.c
+++ b/file_extract.c
@@ -199,18 +199,21 @@ static bool zip_extract_cb(const char *name, const uint8_t *cdata, unsigned cmod
 
 bool zlib_extract_first_rom(char *zip_path, size_t zip_path_size, const char *valid_exts)
 {
+   bool ret;
+   struct zip_extract_userdata userdata = {0};
+   struct string_list *list;
+
    if (!valid_exts)
    {
       RARCH_ERR("Libretro implementation does not have any valid extensions. Cannot unzip without knowing this.\n");
       return false;
    }
 
-   bool ret = true;
-   struct string_list *list = string_split(valid_exts, "|");
+   ret = true;
+   list = string_split(valid_exts, "|");
    if (!list)
       GOTO_END_ERROR();
 
-   struct zip_extract_userdata userdata = {0};
    userdata.zip_path = zip_path;
    userdata.zip_path_size = zip_path_size;
    userdata.ext = list;
diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index 45ca989554..19a38afc5b 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -310,9 +310,7 @@ typedef struct
    const uint8_t *font;
    bool alloc_font;
 
-#ifdef HAVE_DYNAMIC
    char libretro_dir[PATH_MAX];
-#endif
    struct retro_system_info info;
    bool load_no_rom;