[前][次][番号順一覧][スレッド一覧]

ruby-changes:68039

From: xtkoba <ko1@a...>
Date: Mon, 20 Sep 2021 00:15:49 +0900 (JST)
Subject: [ruby-changes:68039] 4705ebd907 (master): MINGW: Fix build error on Windows UCRT

https://git.ruby-lang.org/ruby.git/commit/?id=4705ebd907

From 4705ebd907343cf635cbd9288503653fccf61f0f Mon Sep 17 00:00:00 2001
From: "xtkoba (Tee KOBAYASHI)" <xtkoba+ruby@g...>
Date: Mon, 21 Jun 2021 14:41:25 +0200
Subject: MINGW: Fix build error on Windows UCRT

---
 win32/win32.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/win32/win32.c b/win32/win32.c
index 5640316..b0e43ed 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -887,6 +887,13 @@ socklist_delete(SOCKET *sockp, int *flagp) https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L887
     return ret;
 }
 
+#if RUBY_MSVCRT_VERSION >= 80
+# ifdef __MINGW32__
+#  define _CrtSetReportMode(type,mode) ((void)0)
+#  define _RTC_SetErrorFunc(func) ((void)0)
+# endif
+static void set_pioinfo_extra(void);
+#endif
 static int w32_cmdvector(const WCHAR *, char ***, UINT, rb_encoding *);
 //
 // Initialization stuff
@@ -896,7 +903,6 @@ void https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L903
 rb_w32_sysinit(int *argc, char ***argv)
 {
 #if RUBY_MSVCRT_VERSION >= 80
-    static void set_pioinfo_extra(void);
 
     _CrtSetReportMode(_CRT_ASSERT, 0);
     _set_invalid_parameter_handler(invalid_parameter);
-- 
cgit v1.1


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

[前][次][番号順一覧][スレッド一覧]