mirror of
https://github.com/ruby/ruby.git
synced 2025-09-15 08:33:58 +02:00
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(-)
This commit is contained in:
parent
e050dd5323
commit
ff2ea4daeb
3 changed files with 4 additions and 4 deletions
2
file.c
2
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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue