Skip to content

Commit 60072b0

Browse files
committed
Get the right inherited definitions of dev_t etc instead of falling back to system headers.
The interaction of C++ templates and scoping rules is weird.
1 parent 9e5cb2c commit 60072b0

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

src/kernel_abi.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2511,21 +2511,21 @@ struct GenericArch : public BaseArch<arch_, wordsize> {
25112511
typedef uint32_t legacy_gid_t;
25122512

25132513
struct stat_t {
2514-
dev_t st_dev;
2515-
ino_t st_ino;
2516-
mode_t st_mode;
2517-
nlink_t st_nlink;
2518-
uid_t st_uid;
2519-
gid_t st_gid;
2520-
dev_t st_rdev;
2514+
typename Base<Arch>::dev_t st_dev;
2515+
typename Base<Arch>::ino_t st_ino;
2516+
typename Base<Arch>::mode_t st_mode;
2517+
typename Base<Arch>::nlink_t st_nlink;
2518+
typename Base<Arch>::uid_t st_uid;
2519+
typename Base<Arch>::gid_t st_gid;
2520+
typename Base<Arch>::dev_t st_rdev;
25212521
unsigned long __pad1;
2522-
off_t st_size;
2523-
blksize_t st_blksize;
2522+
typename Base<Arch>::off_t st_size;
2523+
typename Base<Arch>::blksize_t st_blksize;
25242524
int __pad2;
2525-
blkcnt_t st_blocks;
2526-
struct timespec st_atim;
2527-
struct timespec st_mtim;
2528-
struct timespec st_ctim;
2525+
typename Base<Arch>::blkcnt_t st_blocks;
2526+
struct typename Base<Arch>::timespec st_atim;
2527+
struct typename Base<Arch>::timespec st_mtim;
2528+
struct typename Base<Arch>::timespec st_ctim;
25292529
int __rr_unused[2];
25302530
};
25312531

0 commit comments

Comments
 (0)