kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 2a6bfd22468343003463e0cbf91953a01b0dbba5,3ac28de5414c81a0da8c8ec969ea74db5a0f1b0f: [Backport #17645]

Browse source 
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:
NARUSE, Yui 2021-03-14 21:30:23 +09:00
parent e050dd5323
commit ff2ea4daeb
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
file.c
View file

@ -1253,7 +1253,7 @@ statx_birthtime(const struct statx *stx, VALUE fname)
/* birthtime is not supported on the filesystem */ /* birthtime is not supported on the filesystem */
statx_notimplement("birthtime"); 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; typedef struct statx statx_data;

2
thread_sync.c
View file

@ -560,7 +560,7 @@ rb_mutex_sleep(VALUE self, VALUE timeout)
RUBY_VM_CHECK_INTS_BLOCKING(GET_EC()); RUBY_VM_CHECK_INTS_BLOCKING(GET_EC());
time_t end = time(0) - beg; time_t end = time(0) - beg;
return INT2FIX(end); return TIMET2NUM(end);
} }
/* /*

4
version.h
View file

@ -12,11 +12,11 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 56 #define RUBY_PATCHLEVEL 57
#define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3
#define RUBY_RELEASE_DAY 13 #define RUBY_RELEASE_DAY 14
#include "ruby/version.h" #include "ruby/version.h"