summaryrefslogtreecommitdiff
path: root/file.c
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2021-03-20 13:02:33 +0900
committernagachika <nagachika@ruby-lang.org>2021-03-20 13:02:33 +0900
commit9994860dcb56697fad1799128d1493adc06b23c7 (patch)
treee25495d68ea821ec044c3aa49b90443765d4fb78 /file.c
parent30942fc4d89a04792e9eba7d3c4e5009c54e81da (diff)
merge revision(s) 2a6bfd22468343003463e0cbf91953a01b0dbba5,3ac28de5414c81a0da8c8ec969ea74db5a0f1b0f: [Backport #17645]
Properly convert time_t [Bug #17645] --- thread_sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Explicitly cast __s64 to time_t [Bug #17645] A workaround of shorten-64-to-32 error where 32-bit linux. --- file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Diffstat (limited to 'file.c')
-rw-r--r--file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/file.c b/file.c
index c46377b933..f67b1f1dd8 100644
--- a/file.c
+++ b/file.c
@@ -1224,7 +1224,7 @@ statx_birthtime(const struct statx *stx, VALUE fname)
/* birthtime is not supported on the filesystem */
statx_notimplement("birthtime");
}
- return rb_time_nano_new(stx->stx_btime.tv_sec, stx->stx_btime.tv_nsec);
+ return rb_time_nano_new((time_t)stx->stx_btime.tv_sec, stx->stx_btime.tv_nsec);
}
typedef struct statx statx_data;