libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-07 18:07:27 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

rarch_defer_core - put another codeblock around an ifdef

Browse Source
This commit is contained in:
twinaphex 2014-12-15 17:29:29 +01:00
parent c30ddccd3e
commit b22d58fd10
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
general.c
View File

@ -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,

4
libretro-sdk/file/file_path.c
View File

@ -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)