From 2bb5fa495bf9d366d3c1fefc6b093dc4830f27bf Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 13 Mar 2022 15:20:35 +0900 Subject: [PATCH] merge revision(s) 29f6f79e7396018962eb25c5f5e409f5fe28a73b: [Backport #17788] [Backport #18574] Get `ruby_nonempty_memcpy` to have C linkage Fixes [Bug #17788] --- include/ruby/internal/memory.h | 2 ++ 1 file changed, 2 insertions(+) --- include/ruby/internal/memory.h | 2 ++ version.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/ruby/internal/memory.h b/include/ruby/internal/memory.h index 64f3101fc2..46dfcadd10 100644 --- a/include/ruby/internal/memory.h +++ b/include/ruby/internal/memory.h @@ -256,6 +256,7 @@ rb_alloc_tmp_buffer2(volatile VALUE *store, long count, size_t elsize) } #ifndef __MINGW32__ +RBIMPL_SYMBOL_EXPORT_BEGIN() RBIMPL_ATTR_NOALIAS() RBIMPL_ATTR_NONNULL((1)) RBIMPL_ATTR_RETURNS_NONNULL() @@ -272,6 +273,7 @@ ruby_nonempty_memcpy(void *dest, const void *src, size_t n) return dest; } } +RBIMPL_SYMBOL_EXPORT_END() #undef memcpy #define memcpy ruby_nonempty_memcpy #endif diff --git a/version.h b/version.h index f9ff56dbbf..4db4741b26 100644 --- a/version.h +++ b/version.h @@ -12,7 +12,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 4 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 195 +#define RUBY_PATCHLEVEL 196 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 3