From ff2ea4daeb795ebb3d0afa8c57d86a4af9757e50 Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Sun, 14 Mar 2021 21:30:23 +0900 Subject: 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(-) --- file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'file.c') diff --git a/file.c b/file.c index 0c599b0895..e77042fe20 100644 --- a/file.c +++ b/file.c @@ -1253,7 +1253,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; -- cgit v1.2.3