Skip to content

Commit cc6e4d7

Browse files
committed
Fix crossplatform includes
1 parent e92889a commit cc6e4d7

File tree

1 file changed

+30
-22
lines changed

1 file changed

+30
-22
lines changed

Src/Files/Paths.cpp

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@
1111
#include <windows.h>
1212
#elif P_PLATFORM_LINUX || P_PLATFORM_MACOS || P_PLATFORM_BSD || P_PLATFORM_ANDROID || P_PLATFORM_IOS
1313
#include <sys/stat.h>
14+
15+
#if P_PLATFORM_LINUX || P_PLATFORM_ANDROID
16+
#include <sys/vfs.h>
17+
#elif P_PLATFORM_MACOS || P_PLATFORM_BSD || P_PLATFORM_IOS
18+
#include <sys/mount.h>
19+
#include <sys/param.h>
20+
#endif
21+
1422
/** Remote file systems codes */
1523
#define P_MAGIC_AFS 0x5346414F
1624
#define P_MAGIC_AUFS 0x61756673
@@ -396,35 +404,35 @@ namespace p
396404

397405
switch (statfsbuf.f_type | 0UL)
398406
{
399-
case S_MAGIC_FUSEBLK: /* 0x65735546 remote */
407+
case P_MAGIC_FUSEBLK: /* 0x65735546 remote */
400408
{
401409
#if P_PLATFORM_LINUX
402410
// TODO: Implement check if FUSE is remote or not. See EFSW's
403411
// isLocalFUSEDirectory
404412
return true;
405413
#endif
406414
}
407-
case S_MAGIC_AFS: /* 0x5346414F remote */
408-
case S_MAGIC_AUFS: /* 0x61756673 remote */
409-
case S_MAGIC_CEPH: /* 0x00C36400 remote */
410-
case S_MAGIC_CIFS: /* 0xFF534D42 remote */
411-
case S_MAGIC_CODA: /* 0x73757245 remote */
412-
case S_MAGIC_FHGFS: /* 0x19830326 remote */
413-
case S_MAGIC_FUSECTL: /* 0x65735543 remote */
414-
case S_MAGIC_GFS: /* 0x01161970 remote */
415-
case S_MAGIC_GPFS: /* 0x47504653 remote */
416-
case S_MAGIC_KAFS: /* 0x6B414653 remote */
417-
case S_MAGIC_LUSTRE: /* 0x0BD00BD0 remote */
418-
case S_MAGIC_NCP: /* 0x564C remote */
419-
case S_MAGIC_NFS: /* 0x6969 remote */
420-
case S_MAGIC_NFSD: /* 0x6E667364 remote */
421-
case S_MAGIC_OCFS2: /* 0x7461636F remote */
422-
case S_MAGIC_PANFS: /* 0xAAD7AAEA remote */
423-
case S_MAGIC_PIPEFS: /* 0x50495045 remote */
424-
case S_MAGIC_SMB: /* 0x517B remote */
425-
case S_MAGIC_SNFS: /* 0xBEEFDEAD remote */
426-
case S_MAGIC_VMHGFS: /* 0xBACBACBC remote */
427-
case S_MAGIC_VXFS: /* 0xA501FCF5 remote */ return true;
415+
case P_MAGIC_AFS: /* 0x5346414F remote */
416+
case P_MAGIC_AUFS: /* 0x61756673 remote */
417+
case P_MAGIC_CEPH: /* 0x00C36400 remote */
418+
case P_MAGIC_CIFS: /* 0xFF534D42 remote */
419+
case P_MAGIC_CODA: /* 0x73757245 remote */
420+
case P_MAGIC_FHGFS: /* 0x19830326 remote */
421+
case P_MAGIC_FUSECTL: /* 0x65735543 remote */
422+
case P_MAGIC_GFS: /* 0x01161970 remote */
423+
case P_MAGIC_GPFS: /* 0x47504653 remote */
424+
case P_MAGIC_KAFS: /* 0x6B414653 remote */
425+
case P_MAGIC_LUSTRE: /* 0x0BD00BD0 remote */
426+
case P_MAGIC_NCP: /* 0x564C remote */
427+
case P_MAGIC_NFS: /* 0x6969 remote */
428+
case P_MAGIC_NFSD: /* 0x6E667364 remote */
429+
case P_MAGIC_OCFS2: /* 0x7461636F remote */
430+
case P_MAGIC_PANFS: /* 0xAAD7AAEA remote */
431+
case P_MAGIC_PIPEFS: /* 0x50495045 remote */
432+
case P_MAGIC_SMB: /* 0x517B remote */
433+
case P_MAGIC_SNFS: /* 0xBEEFDEAD remote */
434+
case P_MAGIC_VMHGFS: /* 0xBACBACBC remote */
435+
case P_MAGIC_VXFS: /* 0xA501FCF5 remote */ return true;
428436
}
429437
#endif
430438
return false;

0 commit comments

Comments
 (0)