From 651774daf1eff2f555839e45f6cc39b10169a1b5 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 15 Jul 2019 06:48:25 +0200 Subject: [PATCH] Revert "(VFS) Add codepath for MSVC CDROM code" This reverts commit 7fb8965416d757ce660ba9054767c2a6b3e485a3. --- libretro-common/vfs/vfs_implementation.c | 5 ----- retroarch.c | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/libretro-common/vfs/vfs_implementation.c b/libretro-common/vfs/vfs_implementation.c index 7e5868e4e0..3842007a90 100644 --- a/libretro-common/vfs/vfs_implementation.c +++ b/libretro-common/vfs/vfs_implementation.c @@ -200,11 +200,6 @@ int64_t retro_vfs_file_seek_internal(libretro_vfs_implementation_file *stream, i { /* VC2005 and up have a special 64-bit fseek */ #ifdef ATLEAST_VC2005 -#ifdef HAVE_CDROM - if (stream->scheme == VFS_SCHEME_CDROM) - return retro_vfs_file_seek_cdrom(stream, offset, whence); - else -#endif return _fseeki64(stream->fp, offset, whence); #elif defined(__CELLOS_LV2__) || defined(_MSC_VER) && _MSC_VER <= 1310 return fseek(stream->fp, (long)offset, whence); diff --git a/retroarch.c b/retroarch.c index 89b7078382..52f5d91a61 100644 --- a/retroarch.c +++ b/retroarch.c @@ -2178,9 +2178,9 @@ bool core_option_manager_get_visible(core_option_manager_t *opt, size_t idx) { if (!opt) - return false; + return NULL; if (idx >= opt->size) - return false; + return NULL; return opt->opts[idx].visible; }