diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2024-07-19 18:39:52 -0400 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2024-07-19 18:42:11 -0400 |
| commit | 87ef6bb9e1c32e6a79a04bdc787ace568848520e (patch) | |
| tree | 78f39c2f096dc46a58ac45892b5753259d8cc5b9 | |
| parent | 6af637645aa30088500ee8dcac3f4d5f596dabce (diff) | |
| download | rockbox-87ef6bb9e1.tar.gz rockbox-87ef6bb9e1.zip | |
hosted: Don't unconditionally pull in mv.h on hosted environments
It causes some conflicts in plugins with the upcoming 64-bit storage enablement
Change-Id: Ia8615c5266c2b29216a05a8d85c3da5186c98d1c
| -rw-r--r-- | firmware/target/hosted/filesystem-hosted.h | 3 | ||||
| -rw-r--r-- | firmware/target/hosted/filesystem-unix.c | 2 | ||||
| -rw-r--r-- | firmware/target/hosted/filesystem-win32.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/firmware/target/hosted/filesystem-hosted.h b/firmware/target/hosted/filesystem-hosted.h index b9c7ce648a..348a921f82 100644 --- a/firmware/target/hosted/filesystem-hosted.h +++ b/firmware/target/hosted/filesystem-hosted.h @@ -21,9 +21,6 @@ #ifndef _FILESYSTEM_HOSTED_H_ #define _FILESYSTEM_HOSTED_H_ -#include "mv.h" - -int os_volume_path(IF_MV(int volume, ) char *buffer, size_t bufsize); void * os_lc_open(const char *ospath); #endif /* _FILESYSTEM_HOSTED_H_ */ diff --git a/firmware/target/hosted/filesystem-unix.c b/firmware/target/hosted/filesystem-unix.c index f0d7de640d..3a14480e11 100644 --- a/firmware/target/hosted/filesystem-unix.c +++ b/firmware/target/hosted/filesystem-unix.c @@ -33,6 +33,8 @@ #include "pathfuncs.h" #include "string-extra.h" +int os_volume_path(IF_MV(int volume, ) char *buffer, size_t bufsize); + #define SAME_FILE_INFO(sb1p, sb2p) \ ((sb1p)->st_dev == (sb2p)->st_dev && (sb1p)->st_ino == (sb2p)->st_ino) diff --git a/firmware/target/hosted/filesystem-win32.c b/firmware/target/hosted/filesystem-win32.c index fac10d003b..ded73b619f 100644 --- a/firmware/target/hosted/filesystem-win32.c +++ b/firmware/target/hosted/filesystem-win32.c @@ -30,6 +30,7 @@ #include "debug.h" #include "pathfuncs.h" #include "string-extra.h" +#include "mv.h" #define SAME_FILE_INFO(lpInfo1, lpInfo2) \ ((lpInfo1)->dwVolumeSerialNumber == (lpInfo2)->dwVolumeSerialNumber && \ @@ -469,6 +470,8 @@ int os_modtime(const char *path, time_t modtime) return 0; } +int os_volume_path(IF_MV(int volume, ) char *buffer, size_t bufsize); + void volume_size(IF_MV(int volume,) unsigned long *sizep, unsigned long *freep) { ULARGE_INTEGER free = { .QuadPart = 0 }, |