Merge branch 'master' of https://github.com/xenia-project/xenia into canary_experimental

src/xenia/vfs/devices/disc_image_entry.cc

@@ -48,7 +48,7 @@ std::unique_ptr<MappedMemory> DiscImageEntry::OpenMapped(
 
   size_t real_offset = data_offset_ + offset;
   size_t real_length = length ? std::min(length, data_size_) : data_size_;
-  return mmap_->Slice(mode, real_offset, real_length);
+  return mmap_->Slice(real_offset, real_length);
 }
 
 }  // namespace vfs

src/xenia/vfs/devices/null_device.cc

@@ -12,6 +12,7 @@
 #include "xenia/base/filesystem.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/math.h"
+#include "xenia/base/string.h"
 #include "xenia/kernel/xfile.h"
 #include "xenia/vfs/devices/null_entry.h"
 
@@ -50,7 +51,7 @@ Entry* NullDevice::ResolvePath(const std::string_view path) {
   }
 
   for (auto& child : root->children()) {
-    if (!strcasecmp(child->path().c_str(), path.data())) {
+    if (!xe_strcasecmp(child->path().c_str(), path.data())) {
       return child.get();
     }
   }