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

Get rid of redefinition of memcpy on mingw

Browse source
This commit is contained in:
Nobuyoshi Nakada 2020-05-26 14:19:20 +09:00
parent 04eb05a8e0
commit 17d17de0e8
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
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

@ -264,6 +264,7 @@ rb_alloc_tmp_buffer2(volatile VALUE *store, long count, size_t elsize)
store, rbimpl_size_mul_or_raise(count, elsize), count); store, rbimpl_size_mul_or_raise(count, elsize), count);
} }
#ifndef __MINGW32__
RBIMPL_ATTR_NOALIAS() RBIMPL_ATTR_NOALIAS()
RBIMPL_ATTR_NONNULL((1)) RBIMPL_ATTR_NONNULL((1))
RBIMPL_ATTR_RETURNS_NONNULL() RBIMPL_ATTR_RETURNS_NONNULL()
@ -282,5 +283,6 @@ ruby_nonempty_memcpy(void *dest, const void *src, size_t n)
} }
#undef memcpy #undef memcpy
#define memcpy ruby_nonempty_memcpy #define memcpy ruby_nonempty_memcpy
#endif
#endif /* RBIMPL_MEMORY_H */ #endif /* RBIMPL_MEMORY_H */

2
win32/file.c
View file

@ -2,12 +2,12 @@
/* before stdio.h in ruby/define.h */ /* before stdio.h in ruby/define.h */
# define MINGW_HAS_SECURE_API 1 # define MINGW_HAS_SECURE_API 1
#endif #endif
#include <wchar.h>
#include "ruby/ruby.h" #include "ruby/ruby.h"
#include "ruby/encoding.h" #include "ruby/encoding.h"
#include "internal.h" #include "internal.h"
#include "internal/error.h" #include "internal/error.h"
#include <winbase.h> #include <winbase.h>
#include <wchar.h>
#include <shlwapi.h> #include <shlwapi.h>
#include "win32/file.h" #include "win32/file.h"