summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorJohn Kristian <jmk2001@engineer.com>2001-08-02 17:59:08 -0700
committerJarkko Hietaniemi <jhi@iki.fi>2001-08-03 13:46:40 +0000
commit6f24f39d75e844cc3d1cf132bef7deb3cf5aeff4 (patch)
treecbc9ba5f4d30e0cdf54c9c8eb4be5dfb1a3e6cf3 /win32
parentc72a9197934e32c342550df20770108281929fd4 (diff)
downloadperl-6f24f39d75e844cc3d1cf132bef7deb3cf5aeff4.tar.gz
Re: [ID 20010731.105] MinGW can't compile win32.c on Windows 2000
Message-id: <03a101c11bf2$2c9b5ee0$0100a8c0@JOHNKRISTIAN> p4raw-id: //depot/perl@11565
Diffstat (limited to 'win32')
-rw-r--r--win32/win32.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/win32/win32.c b/win32/win32.c
index 033ebb93e9..687f121c8f 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