summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/ruby/internal/memory.h2
-rw-r--r--win32/file.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/ruby/internal/memory.h b/include/ruby/internal/memory.h
index 5214f2b391..0128a7f748 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)
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)
}
#undef memcpy
#define memcpy ruby_nonempty_memcpy
+#endif
#endif /* RBIMPL_MEMORY_H */
diff --git a/win32/file.c b/win32/file.c
index a1b40984d0..133b5fbdb0 100644
--- a/win32/file.c
+++ b/win32/file.c
@@ -2,12 +2,12 @@
/* 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"