summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
Diffstat (limited to 'win32')
-rw-r--r--win32/win32.c6
-rw-r--r--win32/win32.h2
2 files changed, 2 insertions, 6 deletions
diff --git a/win32/win32.c b/win32/win32.c
index 2df9c7c880..eb486e3a48 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1439,15 +1439,11 @@ win32_uname(struct utsname *name)
char *arch;
GetSystemInfo(&info);
-#ifdef __MINGW32__
- switch (info.DUMMYUNIONNAME.DUMMYSTRUCTNAME.wProcessorArchitecture) {
-#else
-#ifdef __BORLANDC__
+#if defined(__BORLANDC__) || defined(__MINGW32__)
switch (info.u.s.wProcessorArchitecture) {
#else
switch (info.wProcessorArchitecture) {
#endif
-#endif
case PROCESSOR_ARCHITECTURE_INTEL:
arch = "x86"; break;
case PROCESSOR_ARCHITECTURE_MIPS:
diff --git a/win32/win32.h b/win32/win32.h
index ee25b5afce..75e3c61cbb 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -23,7 +23,7 @@
#endif
#ifdef __GNUC__
-// typedef long long __int64;
+typedef long long __int64;
# define Win32_Winsock
/* GCC does not do __declspec() - render it a nop
* and turn on options to avoid importing data