Module: wine Branch: master Commit: 74d63c020c9ab7b356b5cafdfb30b47e9cb952c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d63c020c9ab7b356b5cafdfb...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Dec 9 17:42:13 2008 +0100
include: Fix the definition of 64-bit types for Mingw64.
---
include/basetsd.h | 2 +- include/msvcrt/direct.h | 2 +- include/msvcrt/io.h | 2 +- include/msvcrt/malloc.h | 2 +- include/msvcrt/mbstring.h | 2 +- include/msvcrt/memory.h | 2 +- include/msvcrt/search.h | 2 +- include/msvcrt/stddef.h | 2 +- include/msvcrt/stdio.h | 2 +- include/msvcrt/stdlib.h | 2 +- include/msvcrt/string.h | 2 +- include/msvcrt/sys/types.h | 2 +- include/msvcrt/time.h | 2 +- include/msvcrt/wchar.h | 2 +- include/windef.h | 17 +++++++++-------- 15 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/include/basetsd.h b/include/basetsd.h index 8f853a4..409f958 100644 --- 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 b0c4af8..d71aee0 100644 --- 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 6009fe9..ef4a312 100644 --- 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 bee2173..b71c4fd 100644 --- 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 124d215..a9c38cf 100644 --- 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 a5217df..e2f5a37 100644 --- 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 af648d5..ff5bf80 100644 --- 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 eb45c87..d0fe7de 100644 --- 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 b177664..55d9444 100644 --- 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 ddaae61..0010c33 100644 --- 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 a963553..d70cd23 100644 --- 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 663ad62..dac8d64 100644 --- 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 deb17e1..9b9a516 100644 --- 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 611b738..4e4892f 100644 --- 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 8c0a0bb..3c9de7a 100644 --- 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__