[ruby-core:17368] Re: Building on MinGW broken (patch for win32/win32.c)

Hello,

In message "[ruby-core:17367] Building on MinGW broken (patch for win32/win32.c)"
    on Jun.21,2008 23:25:28, <[e-mail]> wrote:
> The change in r17376 to win32/win32.c breaks compilation on MinGW/MSYS. 
> make.exe fails because miniruby.exe invokes it without a stdin/stdout. 
> There is a couple of issues with the "CreateChild" function:

Can you test this patch instead of yours?

Index: win32/win32.c
===================================================================
--- win32/win32.c	(revision 17505)
+++ win32/win32.c	(working copy)
@@ -200,14 +200,13 @@ rb_w32_map_errno(DWORD winerr)
 
 static const char *NTLoginName;
 
+static OSVERSIONINFO osver;
 #ifdef WIN95
 static DWORD Win32System = (DWORD)-1;
 
 DWORD
 rb_w32_osid(void)
 {
-    static OSVERSIONINFO osver;
-
     if (osver.dwPlatformId != Win32System) {
 	memset(&osver, 0, sizeof(OSVERSIONINFO));
 	osver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
@@ -217,6 +216,19 @@ rb_w32_osid(void)
     return (Win32System);
 }
 #endif
+static DWORD Win32Version = (DWORD)-1;
+
+static DWORD
+rb_w32_osver(void)
+{
+    if (osver.dwMajorVersion != Win32Version) {
+	memset(&osver, 0, sizeof(OSVERSIONINFO));
+	osver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+	GetVersionEx(&osver);
+	Win32Version = osver.dwMajorVersion;
+    }
+    return (Win32Version);
+}
 
 #define IsWinNT() rb_w32_iswinnt()
 #define IsWin95() rb_w32_iswin95()
@@ -882,7 +894,7 @@ CreateChild(const char *cmd, const char 
     if (!psa) {
 	sa.nLength              = sizeof (SECURITY_ATTRIBUTES);
 	sa.lpSecurityDescriptor = NULL;
-	sa.bInheritHandle       = FALSE;
+	sa.bInheritHandle       = IsWinNT() && rb_w32_osver() > 5 ? FALSE : TRUE;
 	psa = &sa;
     }
 

Regards,
-- 
U.Nakamura <[e-mail]>