From 9994860dcb56697fad1799128d1493adc06b23c7 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sat, 20 Mar 2021 13:02:33 +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 +- thread_sync.c | 2 +- version.h | 2 +- 3 files changed, 3 insertions(+), 3 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; diff --git a/thread_sync.c b/thread_sync.c index efe295e64c..4c065dd25b 100644 --- a/thread_sync.c +++ b/thread_sync.c @@ -484,7 +484,7 @@ rb_mutex_sleep(VALUE self, VALUE timeout) } RUBY_VM_CHECK_INTS_BLOCKING(GET_EC()); end = time(0) - beg; - return INT2FIX(end); + return TIMET2NUM(end); } /* diff --git a/version.h b/version.h index 293453a480..ef9fcd0e5c 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 162 +#define RUBY_PATCHLEVEL 163 #define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_MONTH 3 -- cgit v1.2.3