From f4250a1ad5e24337de54d42ece37cc827769ad11 Mon Sep 17 00:00:00 2001
From: Twinaphex <libretro@gmail.com>
Date: Fri, 5 Jan 2018 14:13:58 +0100
Subject: [PATCH] Silence unused variable warnings

---
 libretro-common/file/archive_file_7z.c | 10 ++--------
 libretro-common/formats/libchdr/chd.c  |  4 ++++
 menu/drivers/materialui.c              |  2 --
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/libretro-common/file/archive_file_7z.c b/libretro-common/file/archive_file_7z.c
index c4e68079a5..2e3dc9c0f6 100644
--- a/libretro-common/file/archive_file_7z.c
+++ b/libretro-common/file/archive_file_7z.c
@@ -134,9 +134,6 @@ static int sevenzip_file_read(
    CSzArEx db;
    uint8_t *output      = 0;
    long outsize         = -1;
-#ifndef LEGACY_WIN32
-   wchar_t *pathW       = NULL;
-#endif
 
    /*These are the allocation routines.
     * Currently using the non-standard 7zip choices. */
@@ -148,7 +145,7 @@ static int sevenzip_file_read(
 #if defined(_WIN32) && defined(USE_WINDOWS_FILE) && !defined(LEGACY_WIN32)
    if (!string_is_empty(path))
    {
-      pathW = utf8_to_utf16_string_alloc(path);
+      whcar_t *pathW = utf8_to_utf16_string_alloc(path);
 
       if (pathW)
       {
@@ -354,9 +351,6 @@ static int sevenzip_parse_file_init(file_archive_transfer_t *state,
 {
    struct sevenzip_context_t *sevenzip_context =
          (struct sevenzip_context_t*)sevenzip_stream_new();
-#ifndef LEGACY_WIN32
-   wchar_t *fileW = NULL;
-#endif
 
    if (state->archive_size < SEVENZIP_MAGIC_LEN)
       goto error;
@@ -369,7 +363,7 @@ static int sevenzip_parse_file_init(file_archive_transfer_t *state,
 #if defined(_WIN32) && defined(USE_WINDOWS_FILE) && !defined(LEGACY_WIN32)
    if (!string_is_empty(file))
    {
-      fileW = utf8_to_utf16_string_alloc(file);
+      wchar_t *fileW = utf8_to_utf16_string_alloc(file);
 
       if (fileW)
       {
diff --git a/libretro-common/formats/libchdr/chd.c b/libretro-common/formats/libchdr/chd.c
index 6e9d5ea3bf..75ba702891 100644
--- a/libretro-common/formats/libchdr/chd.c
+++ b/libretro-common/formats/libchdr/chd.c
@@ -604,7 +604,9 @@ void cdlz_codec_free(void* codec)
 
 chd_error cdlz_codec_decompress(void *codec, const uint8_t *src, uint32_t complen, uint8_t *dest, uint32_t destlen)
 {
+#ifdef WANT_RAW_DATA_SECTOR
 	uint8_t *sector;
+#endif
 	uint32_t framenum;
 	cdlz_codec_data* cdlz = (cdlz_codec_data*)codec;
 
@@ -691,7 +693,9 @@ void cdzl_codec_free(void *codec)
 
 chd_error cdzl_codec_decompress(void *codec, const uint8_t *src, uint32_t complen, uint8_t *dest, uint32_t destlen)
 {
+#ifdef WANT_RAW_DATA_SECTOR
 	uint8_t *sector;
+#endif
 	uint32_t framenum;
 	cdzl_codec_data* cdzl = (cdzl_codec_data*)codec;
 
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 7650be7b78..2ddcd1b746 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -2027,8 +2027,6 @@ static int mui_list_push(void *data, void *userdata,
    {
       case DISPLAYLIST_LOAD_CONTENT_LIST:
          {
-            settings_t   *settings      = config_get_ptr();
-            
             menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
 
             menu_entries_append_enum(info->list,