len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

hosted: Don't unconditionally pull in mv.h on hosted environments

Browse source 
It causes some conflicts in plugins with the upcoming 64-bit storage enablement

Change-Id: Ia8615c5266c2b29216a05a8d85c3da5186c98d1c
This commit is contained in:
Solomon Peachy 2024-07-19 18:39:52 -04:00
parent 6af637645a
commit 87ef6bb9e1
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
firmware/target/hosted/filesystem-hosted.h
View file

@ -21,9 +21,6 @@
#ifndef _FILESYSTEM_HOSTED_H_ #ifndef _FILESYSTEM_HOSTED_H_
#define _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); void * os_lc_open(const char *ospath);
#endif /* _FILESYSTEM_HOSTED_H_ */ #endif /* _FILESYSTEM_HOSTED_H_ */

2
firmware/target/hosted/filesystem-unix.c
View file

@ -33,6 +33,8 @@
#include "pathfuncs.h" #include "pathfuncs.h"
#include "string-extra.h" #include "string-extra.h"
int os_volume_path(IF_MV(int volume, ) char *buffer, size_t bufsize);
#define SAME_FILE_INFO(sb1p, sb2p) \ #define SAME_FILE_INFO(sb1p, sb2p) \
((sb1p)->st_dev == (sb2p)->st_dev && (sb1p)->st_ino == (sb2p)->st_ino) ((sb1p)->st_dev == (sb2p)->st_dev && (sb1p)->st_ino == (sb2p)->st_ino)

3
firmware/target/hosted/filesystem-win32.c
View file

@ -30,6 +30,7 @@
#include "debug.h" #include "debug.h"
#include "pathfuncs.h" #include "pathfuncs.h"
#include "string-extra.h" #include "string-extra.h"
#include "mv.h"
#define SAME_FILE_INFO(lpInfo1, lpInfo2) \ #define SAME_FILE_INFO(lpInfo1, lpInfo2) \
((lpInfo1)->dwVolumeSerialNumber == (lpInfo2)->dwVolumeSerialNumber && \ ((lpInfo1)->dwVolumeSerialNumber == (lpInfo2)->dwVolumeSerialNumber && \
@ -469,6 +470,8 @@ int os_modtime(const char *path, time_t modtime)
return 0; 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) void volume_size(IF_MV(int volume,) unsigned long *sizep, unsigned long *freep)
{ {
ULARGE_INTEGER free = { .QuadPart = 0 }, ULARGE_INTEGER free = { .QuadPart = 0 },