include: Fix the definition of 64-bit types for Mingw64.

diff --git a/include/basetsd.h b/include/basetsd.h
index 8f853a41e8d83b34e6e6b06ead2324bc92a7cf4f..409f95816f68f42ded2a167b51e4cf868383f905 100644 (file)
--- a/include/basetsd.h
+++ b/include/basetsd.h
@@ -59,7 +59,7 @@ extern "C" {
 #    define __int32 int
 #  endif
 #  ifndef __int64
-#    ifdef _WIN64
+#    if defined(_WIN64) && !defined(__MINGW64__)
 #      define __int64 long
 #    else
 #      define __int64 long long

diff --git a/include/msvcrt/direct.h b/include/msvcrt/direct.h
index b0c4af816ca761bc75096e85841044f050605624..d71aee0b6326d38cf2db25d7f5b3af14ff058dea 100644 (file)
--- a/include/msvcrt/direct.h
+++ b/include/msvcrt/direct.h
@@ -29,7 +29,7 @@ typedef unsigned short wchar_t;
 #endif
 
 #if !defined(_MSC_VER) && !defined(__int64)
-# ifdef _WIN64
+# if defined(_WIN64) && !defined(__MINGW64__)
 #   define __int64 long
 # else
 #   define __int64 long long

diff --git a/include/msvcrt/io.h b/include/msvcrt/io.h
index 6009fe9d8a95630a6c2bac41c0362c1442d728f3..ef4a312d271588f5351ccbaf1b5ae0763ea3cdb9 100644 (file)
--- a/include/msvcrt/io.h
+++ b/include/msvcrt/io.h
@@ -25,7 +25,7 @@ typedef unsigned short wchar_t;
 #endif
 
 #if !defined(_MSC_VER) && !defined(__int64)
-# ifdef _WIN64
+# if defined(_WIN64) && !defined(__MINGW64__)
 #   define __int64 long
 # else
 #   define __int64 long long

diff --git a/include/msvcrt/malloc.h b/include/msvcrt/malloc.h
index bee2173eb691df03e14572ac772c830c5a1f871b..b71c4fd2b80ba0542103a815f7dc11cdedb5ea46 100644 (file)
--- a/include/msvcrt/malloc.h
+++ b/include/msvcrt/malloc.h
@@ -39,7 +39,7 @@
 #endif
 
 #if !defined(_MSC_VER) && !defined(__int64)
-# ifdef _WIN64
+# if defined(_WIN64) && !defined(__MINGW64__)
 #   define __int64 long
 # else
 #   define __int64 long long

diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h
index 124d215c0b07627dcbe0865eac7381f7b46fdbbf..a9c38cf4f5175cc784ad8b7a9157a9b2643e24bd 100644 (file)
--- a/include/msvcrt/mbstring.h
+++ b/include/msvcrt/mbstring.h
@@ -30,7 +30,7 @@
 #endif
 
 #if !defined(_MSC_VER) && !defined(__int64)
-# ifdef _WIN64
+# if defined(_WIN64) && !defined(__MINGW64__)
 #   define __int64 long
 # else
 #   define __int64 long long

diff --git a/include/msvcrt/memory.h b/include/msvcrt/memory.h
index a5217df85ead2fb1ec4bde8413c1bc1f8d11be78..e2f5a37bdda7f99955c7c84218aba35c8fdd418f 100644 (file)
--- a/include/msvcrt/memory.h
+++ b/include/msvcrt/memory.h
@@ -16,7 +16,7 @@
 #endif
 
 #if !defined(_MSC_VER) && !defined(__int64)
-# ifdef _WIN64
+# if defined(_WIN64) && !defined(__MINGW64__)
 #   define __int64 long
 # else
 #   define __int64 long long

diff --git a/include/msvcrt/search.h b/include/msvcrt/search.h
index af648d58ac7cf2050a780c785a621f37dde8cb90..ff5bf80a559a58448f4f302e3bd41cd76504f951 100644 (file)
--- a/include/msvcrt/search.h
+++ b/include/msvcrt/search.h
@@ -28,7 +28,7 @@
 #endif
 
 #if !defined(_MSC_VER) && !defined(__int64)
-# ifdef _WIN64
+# if defined(_WIN64) && !defined(__MINGW64__)
 #   define __int64 long
 # else
 #   define __int64 long long

diff --git a/include/msvcrt/stddef.h b/include/msvcrt/stddef.h
index eb45c87da7d111d1be00b3b1ae4bc4bb76e2946b..d0fe7de3ef2a8c3703f4b9100d3173b34ec8ecee 100644 (file)
--- a/include/msvcrt/stddef.h
+++ b/include/msvcrt/stddef.h
@@ -28,7 +28,7 @@
 #endif
 
 #if !defined(_MSC_VER) && !defined(__int64)
-# ifdef _WIN64
+# if defined(_WIN64) && !defined(__MINGW64__)
 #   define __int64 long
 # else
 #   define __int64 long long

diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h
index b1776646211275ac9c76697914ba43c2597f7f46..55d944419d1013216c252e1b4b3f834bd104514f 100644 (file)
--- a/include/msvcrt/stdio.h
+++ b/include/msvcrt/stdio.h
@@ -22,7 +22,7 @@
 #endif
 
 #if !defined(_MSC_VER) && !defined(__int64)
-# ifdef _WIN64
+# if defined(_WIN64) && !defined(__MINGW64__)
 #   define __int64 long
 # else
 #   define __int64 long long

diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h
index ddaae617f50cfeb3ea934f7192eb07f9b670a0fc..0010c3310fe929e2decf492101edfa3a67e442fa 100644 (file)
--- a/include/msvcrt/stdlib.h
+++ b/include/msvcrt/stdlib.h
@@ -49,7 +49,7 @@ typedef struct
 #endif
 
 #if !defined(_MSC_VER) && !defined(__int64)
-# ifdef _WIN64
+# if defined(_WIN64) && !defined(__MINGW64__)
 #   define __int64 long
 # else
 #   define __int64 long long

diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h
index a963553312b02f94235181924ef38ee884fdf53e..d70cd23947e2d9909690a2f7559592fc61211265 100644 (file)
--- a/include/msvcrt/string.h
+++ b/include/msvcrt/string.h
@@ -23,7 +23,7 @@ typedef unsigned short wchar_t;
 #endif
 
 #if !defined(_MSC_VER) && !defined(__int64)
-# ifdef _WIN64
+# if defined(_WIN64) && !defined(__MINGW64__)
 #   define __int64 long
 # else
 #   define __int64 long long

diff --git a/include/msvcrt/sys/types.h b/include/msvcrt/sys/types.h
index 663ad629b660e2c0208670e1b95a665a52659304..dac8d64c9841372de6e32326cc6d2a856d3b704d 100644 (file)
--- a/include/msvcrt/sys/types.h
+++ b/include/msvcrt/sys/types.h
@@ -28,7 +28,7 @@
 #endif
 
 #if !defined(_MSC_VER) && !defined(__int64)
-# ifdef _WIN64
+# if defined(_WIN64) && !defined(__MINGW64__)
 #   define __int64 long
 # else
 #   define __int64 long long

diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h
index deb17e1439d14dc0eac948b802c9e22c06d5ff19..9b9a5164f303ebd09f3229f355cc12b0e6624b0c 100644 (file)
--- a/include/msvcrt/time.h
+++ b/include/msvcrt/time.h
@@ -37,7 +37,7 @@ typedef unsigned short wchar_t;
 #endif
 
 #if !defined(_MSC_VER) && !defined(__int64)
-# ifdef _WIN64
+# if defined(_WIN64) && !defined(__MINGW64__)
 #   define __int64 long
 # else
 #   define __int64 long long

diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h
index 611b738d8320de2231814b1a7003a2386807384b..4e4892ff1a74d3b77305fe77d0f7bf47302850d9 100644 (file)
--- a/include/msvcrt/wchar.h
+++ b/include/msvcrt/wchar.h
@@ -42,7 +42,7 @@ typedef unsigned short wchar_t;
 #endif
 
 #if !defined(_MSC_VER) && !defined(__int64)
-# ifdef _WIN64
+# if defined(_WIN64) && !defined(__MINGW64__)
 #   define __int64 long
 # else
 #   define __int64 long long

diff --git a/include/windef.h b/include/windef.h
index 8c0a0bb3eab4ca060d89c5ce377286c242276836..3c9de7a9137441bb8df4f80e159994499424e5eb 100644 (file)
--- a/include/windef.h
+++ b/include/windef.h
@@ -37,18 +37,19 @@ extern "C" {
 
 /* Calling conventions definitions */
 
-#if defined(__i386__) && !defined(_X86_)
-# define _X86_
-#endif
-
-#if defined(_X86_) && !defined(__i386__)
-# define __i386__
-#endif
-
 #if defined(__x86_64__) && !defined(_WIN64)
 #define _WIN64
 #endif
 
+#ifndef _WIN64
+# if defined(__i386__) && !defined(_X86_)
+#  define _X86_
+# endif
+# if defined(_X86_) && !defined(__i386__)
+#  define __i386__
+# endif
+#endif
+
 #ifndef __stdcall
 # ifdef __i386__
 #  ifdef __GNUC__