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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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__