archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 09:33:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 29f6f79e73: [Backport #17788] [Backport #18574]

Browse source 
Get `ruby_nonempty_memcpy` to have C linkage

	Fixes [Bug #17788]
	---
	 include/ruby/internal/memory.h | 2 ++
	 1 file changed, 2 insertions(+)
This commit is contained in:
nagachika 2022-03-13 15:20:35 +09:00
parent 0bd3e436e2
commit 2bb5fa495b
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/ruby/internal/memory.h
View file

@ -256,6 +256,7 @@ rb_alloc_tmp_buffer2(volatile VALUE *store, long count, size_t elsize)
} }
#ifndef __MINGW32__ #ifndef __MINGW32__
RBIMPL_SYMBOL_EXPORT_BEGIN()
RBIMPL_ATTR_NOALIAS() RBIMPL_ATTR_NOALIAS()
RBIMPL_ATTR_NONNULL((1)) RBIMPL_ATTR_NONNULL((1))
RBIMPL_ATTR_RETURNS_NONNULL() RBIMPL_ATTR_RETURNS_NONNULL()
@ -272,6 +273,7 @@ ruby_nonempty_memcpy(void *dest, const void *src, size_t n)
return dest; return dest;
} }
} }
RBIMPL_SYMBOL_EXPORT_END()
#undef memcpy #undef memcpy
#define memcpy ruby_nonempty_memcpy #define memcpy ruby_nonempty_memcpy
#endif #endif

2
version.h
View file

@ -12,7 +12,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 4 #define RUBY_VERSION_TEENY 4
#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 195 #define RUBY_PATCHLEVEL 196
#define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_YEAR 2022
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3