From: John Kristian <jmk2001@engineer.com>
Date: Fri, 3 Aug 2001 00:59:08 +0000 (-0700)
Subject: Re: [ID 20010731.105] MinGW can't compile win32.c on Windows 2000
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6f24f39d75e844cc3d1cf132bef7deb3cf5aeff4;p=p5sagit%2Fp5-mst-13.2.git

Re: [ID 20010731.105] MinGW can't compile win32.c on Windows 2000
Message-id: <03a101c11bf2$2c9b5ee0$0100a8c0@JOHNKRISTIAN>

p4raw-id: //depot/perl@11565
---

diff --git a/win32/win32.c b/win32/win32.c
index 033ebb9..687f121 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1652,7 +1652,8 @@ win32_uname(struct utsname *name)
 	char *arch;
 	GetSystemInfo(&info);
 
-#if (defined(__BORLANDC__)&&(__BORLANDC__<=0x520)) || defined(__MINGW32__)
+#if (defined(__BORLANDC__)&&(__BORLANDC__<=0x520)) \
+ || (defined(__MINGW32__) && !defined(_ANONYMOUS_UNION))
 	switch (info.u.s.wProcessorArchitecture) {
 #else
 	switch (info.wProcessorArchitecture) {
@@ -2072,7 +2073,7 @@ win32_feof(FILE *fp)
 DllExport char *
 win32_strerror(int e) 
 {
-#ifndef __BORLANDC__		/* Borland intolerance */
+#if !defined __BORLANDC__ && !defined __MINGW32__      /* compiler intolerance */
     extern int sys_nerr;
 #endif
     DWORD source = 0;
@@ -2539,7 +2540,8 @@ Nt4CreateHardLinkW(
     StreamId.dwStreamId = BACKUP_LINK;
     StreamId.dwStreamAttributes = 0;
     StreamId.dwStreamNameSize = 0;
-#if defined(__BORLANDC__) || defined(__MINGW32__)
+#if defined(__BORLANDC__) \
+ ||(defined(__MINGW32__) && !defined(_ANONYMOUS_UNION))
     StreamId.Size.u.HighPart = 0;
     StreamId.Size.u.LowPart = dwLen;
 #else