https://git.ruby-lang.org/ruby.git/commit/?id=17d17de0e8

From 17d17de0e8891bba2ab509714fc52764eaeafd65 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Tue, 26 May 2020 14:19:20 +0900
Subject: Get rid of redefinition of memcpy on mingw


diff --git a/include/ruby/internal/memory.h b/include/ruby/internal/memory.h
index 5214f2b..0128a7f 100644
--- a/include/ruby/internal/memory.h
+++ b/include/ruby/internal/memory.h
@@ -264,6 +264,7 @@ rb_alloc_tmp_buffer2(volatile VALUE *store, long count, size_t elsize) https://github.com/ruby/ruby/blob/trunk/include/ruby/internal/memory.h#L264
         store, rbimpl_size_mul_or_raise(count, elsize), count);
 }
 
+#ifndef __MINGW32__
 RBIMPL_ATTR_NOALIAS()
 RBIMPL_ATTR_NONNULL((1))
 RBIMPL_ATTR_RETURNS_NONNULL()
@@ -282,5 +283,6 @@ ruby_nonempty_memcpy(void *dest, const void *src, size_t n) https://github.com/ruby/ruby/blob/trunk/include/ruby/internal/memory.h#L283
 }
 #undef memcpy
 #define memcpy ruby_nonempty_memcpy
+#endif
 
 #endif /* RBIMPL_MEMORY_H */
diff --git a/win32/file.c b/win32/file.c
index a1b4098..133b5fb 100644
--- a/win32/file.c
+++ b/win32/file.c
@@ -2,12 +2,12 @@ https://github.com/ruby/ruby/blob/trunk/win32/file.c#L2
 /* before stdio.h in ruby/define.h */
 # define MINGW_HAS_SECURE_API 1
 #endif
-#include <wchar.h>
 #include "ruby/ruby.h"
 #include "ruby/encoding.h"
 #include "internal.h"
 #include "internal/error.h"
 #include <winbase.h>
+#include <wchar.h>
 #include <shlwapi.h>
 #include "win32/file.h"
 
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/