From b22d58fd10746d9565db6f2038c5f1ae1c82d335 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 15 Dec 2014 17:29:29 +0100
Subject: [PATCH] rarch_defer_core - put another codeblock around an ifdef

---
 general.c                     | 2 ++
 libretro-sdk/file/file_path.c | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/general.c b/general.c
index b97e308568..821c09b3ee 100644
--- a/general.c
+++ b/general.c
@@ -103,6 +103,7 @@ int rarch_defer_core(core_info_list_t *core_info, const char *dir,
 
    fill_pathname_join(deferred_path, dir, path, sizeof_deferred_path);
 
+#ifdef HAVE_COMPRESSION
    if (path_is_compressed_file(dir))
    {
       /* In case of a compressed archive, we have to join with a hash */
@@ -110,6 +111,7 @@ int rarch_defer_core(core_info_list_t *core_info, const char *dir,
       rarch_assert(strlen(dir) < strlen(deferred_path));
       deferred_path[strlen(dir)] = '#';
    }
+#endif
 
    if (core_info)
       core_info_list_get_supported_cores(core_info, deferred_path, &info,
diff --git a/libretro-sdk/file/file_path.c b/libretro-sdk/file/file_path.c
index bfe2624588..5ff64f4252 100644
--- a/libretro-sdk/file/file_path.c
+++ b/libretro-sdk/file/file_path.c
@@ -224,6 +224,7 @@ void fill_pathname_base(char *out, const char *in_path, size_t size)
    else
       ptr = in_path;
 
+#ifdef HAVE_COMPRESSION
    /* In case of compression, we also have to consider paths like
     *   /path/to/archive.7z#mygame.img
     *   and
@@ -231,7 +232,6 @@ void fill_pathname_base(char *out, const char *in_path, size_t size)
     *   basename would be mygame.img in both cases
     */
 
-#ifdef HAVE_COMPRESSION
    const char *ptr_bak = ptr;
    ptr = strchr(ptr_bak,'#');
    if (ptr)
@@ -305,9 +305,7 @@ const char *path_basename(const char *path)
 #ifdef HAVE_COMPRESSION
    const char *last_hash = strchr(path,'#');
    if (last_hash > last)
-   {
       return last_hash + 1;
-   }
 #endif
 
    if (last)