1 files changed, 3 insertions, 3 deletions
diff --git a/file.c b/file.c
index b38cd67199..936e0cdb95 100644
--- a/file.c
+++ b/file.c
@@ -543,7 +543,7 @@ rb_stat_new(const struct stat *st)
     if (st) {
 #if RUBY_USE_STATX
 # define CP(m) .stx_ ## m = st->st_ ## m
-# define CP_32(m) .stx_ ## m = (__u32)st->st_ ## m
+# define CP_32(m) .stx_ ## m = (uint32_t)st->st_ ## m
 # define CP_TS(m) .stx_ ## m = stat_ ## m ## spec(st)
         rb_st->stat = (struct statx){
             .stx_mask = STATX_BASIC_STATS,
@@ -662,7 +662,7 @@ rb_stat_dev(VALUE self)
 #if RUBY_USE_STATX
     unsigned int m = get_stat(self)->stx_dev_major;
     unsigned int n = get_stat(self)->stx_dev_minor;
-    return DEVT2NUM(makedev(m, n));
+    return ULL2NUM(makedev(m, n));
 #elif SIZEOF_STRUCT_STAT_ST_DEV <= SIZEOF_DEV_T
     return DEVT2NUM(get_stat(self)->st_dev);
 #elif SIZEOF_STRUCT_STAT_ST_DEV <= SIZEOF_LONG
@@ -833,7 +833,7 @@ rb_stat_rdev(VALUE self)
 #if RUBY_USE_STATX
     unsigned int m = get_stat(self)->stx_rdev_major;
     unsigned int n = get_stat(self)->stx_rdev_minor;
-    return DEVT2NUM(makedev(m, n));
+    return ULL2NUM(makedev(m, n));
 #elif !defined(HAVE_STRUCT_STAT_ST_RDEV)
     return Qnil;
 #elif SIZEOF_STRUCT_STAT_ST_RDEV <= SIZEOF_DEV_T