summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2024-08-31 18:49:27 +0900
committernagachika <nagachika@ruby-lang.org>2024-08-31 18:49:27 +0900
commitb5bb0ee64b24251f103311e56168b96f5334cc6f (patch)
treeef21c4b9a79f73b0d108fadaae035b17a211fb11
parentbec6da392d26677194160cb4875f1bc491db27f5 (diff)
merge revision(s) d23964360335ad561f252cb6fe8e90df7ebee90e:
core_assertions.rb: Support old rubies Some symbol argument might not be accepted by Process.clock_gettime.
-rw-r--r--tool/lib/core_assertions.rb3
-rw-r--r--version.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/tool/lib/core_assertions.rb b/tool/lib/core_assertions.rb
index 7625412e67..4887d944c5 100644
--- a/tool/lib/core_assertions.rb
+++ b/tool/lib/core_assertions.rb
@@ -743,8 +743,7 @@ eom
CLOCK_MONOTONIC
].find do |clk|
if Process.const_defined?(clk)
- clk = clk.to_sym
- begin
+ [clk.to_sym, Process.const_get(clk)].find do |clk|
Process.clock_gettime(clk)
rescue
# Constants may be defined but not implemented, e.g., mingw.
diff --git a/version.h b/version.h
index 90446b31f0..047fc7b129 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 5
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 218
+#define RUBY_PATCHLEVEL 219
#include "ruby/version.h"
#include "ruby/internal/abi.h"