summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNARUSE, Yui <naruse@airemix.jp>2022-02-07 19:55:44 +0900
committerNARUSE, Yui <naruse@airemix.jp>2022-02-07 19:55:44 +0900
commite54289bb632047b750f9c9371410d1adff2a740a (patch)
tree2b8c59fb38a0acdc26734dec337a24ca813b851c
parent6728f692e027ff8ffcfdfb144a54ebf59df8e05f (diff)
merge revision(s) 67f4729: [Backport #18556]
[Bug#18556] Fallback `MAP_ ANONYMOUS` Define `MAP_ANONYMOUS` to `MAP_ANON` if undefined on old systems. --- gc.c | 4 ++++ 1 file changed, 4 insertions(+)
-rw-r--r--gc.c4
-rw-r--r--version.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/gc.c b/gc.c
index d77dc2cda4..ef9327df1f 100644
--- a/gc.c
+++ b/gc.c
@@ -133,6 +133,10 @@
#define rb_jmp_buf rb_jmpbuf_t
#undef rb_data_object_wrap
+#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
+#define MAP_ANONYMOUS MAP_ANON
+#endif
+
static inline struct rbimpl_size_mul_overflow_tag
size_add_overflow(size_t x, size_t y)
{
diff --git a/version.h b/version.h
index ffa648d4d1..da7aae466f 100644
--- a/version.h
+++ b/version.h
@@ -11,11 +11,11 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 13
+#define RUBY_PATCHLEVEL 14
#define RUBY_RELEASE_YEAR 2022
#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 7
#include "ruby/version.h"