summaryrefslogtreecommitdiff
path: root/Source/Core/Common/FatFsUtil.cpp
diff options
context:
space:
mode:
authorScott Mansell <phiren@gmail.com>2023-02-10 21:21:15 +1300
committerGitHub <noreply@github.com>2023-02-10 21:21:15 +1300
commitdad7a32a35d0d28946c16e740692d014a858d2ea (patch)
tree1422619a72cdcdf51e1d1e60509859f664d2d762 /Source/Core/Common/FatFsUtil.cpp
parenta88e5ef3907e79ed20ab67e4df45c36e6ab2b909 (diff)
parent3024ca2146cfdae2e7fb231e8d180dfc81e1a74e (diff)
Merge pull request #11534 from Pokechu22/warning-fixes-feb-2023
Resolve various compiler warnings
Diffstat (limited to 'Source/Core/Common/FatFsUtil.cpp')
-rw-r--r--Source/Core/Common/FatFsUtil.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/Core/Common/FatFsUtil.cpp b/Source/Core/Common/FatFsUtil.cpp
index b003e48f5b..c03e16e4a6 100644
--- a/Source/Core/Common/FatFsUtil.cpp
+++ b/Source/Core/Common/FatFsUtil.cpp
@@ -195,6 +195,7 @@ extern "C" DWORD get_fattime(void)
return static_cast<DWORD>(s_callbacks->GetCurrentTimeFAT());
}
+#if FF_USE_LFN == 3 // match ff.h; currently unused by Dolphin
extern "C" void* ff_memalloc(UINT msize)
{
return std::malloc(msize);
@@ -204,7 +205,9 @@ extern "C" void ff_memfree(void* mblock)
{
return std::free(mblock);
}
+#endif
+#if FF_FS_REENTRANT
extern "C" int ff_cre_syncobj(BYTE vol, FF_SYNC_t* sobj)
{
*sobj = new std::recursive_mutex();
@@ -229,6 +232,7 @@ extern "C" int ff_del_syncobj(FF_SYNC_t sobj)
delete reinterpret_cast<std::recursive_mutex*>(sobj);
return 1;
}
+#endif
static const char* FatFsErrorToString(FRESULT error_code)
{