From 39b41a1f51cbac8572668c3ef2274dc5d5a08ffb Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 17 Dec 2016 11:59:19 +0100
Subject: [PATCH] file_archive_get_file_list - take out HAVE_COMPRESSION code

---
 database_info.c                     | 8 ++++----
 libretro-common/file/archive_file.c | 7 -------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/database_info.c b/database_info.c
index 45bd9baf13..7a37531bc2 100644
--- a/database_info.c
+++ b/database_info.c
@@ -425,8 +425,8 @@ database_info_handle_t *database_info_dir_init(const char *dir,
 
          if (path_is_compressed_file(path) && !path_contains_compressed_file(path))
          {
-            struct string_list *archive_list =
-                  file_archive_get_file_list(path, NULL);
+            struct string_list *archive_list = path_is_compressed_file(path) ?
+                  file_archive_get_file_list(path, NULL) : NULL;
 
             if (archive_list && archive_list->size > 0)
             {
@@ -487,8 +487,8 @@ database_info_handle_t *database_info_file_init(const char *path,
 
    if (path_is_compressed_file(path))
    {
-      struct string_list *archive_list =
-            file_archive_get_file_list(path, NULL);
+      struct string_list *archive_list =path_is_compressed_file(path) ?
+            file_archive_get_file_list(path, NULL) : NULL;
 
       if (archive_list && archive_list->size > 0)
       {
diff --git a/libretro-common/file/archive_file.c b/libretro-common/file/archive_file.c
index 3ac2d12db6..9d26c4e025 100644
--- a/libretro-common/file/archive_file.c
+++ b/libretro-common/file/archive_file.c
@@ -575,13 +575,6 @@ struct string_list *file_archive_get_file_list(const char *path,
 {
    struct archive_extract_userdata userdata = {{0}};
 
-#ifdef HAVE_COMPRESSION
-   if (!path_is_compressed_file(path))
-      return NULL;
-#else
-   return NULL;
-#endif
-
    userdata.list_only = true;
    strlcpy(userdata.archive_path, path, sizeof(userdata.archive_path));