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

This commit is contained in:
Alexandre Julliard 2008-12-09 17:42:13 +01:00
parent 4bddbedc41
commit 74d63c020c
15 changed files with 23 additions and 22 deletions

View File

@ -59,7 +59,7 @@ extern "C" {
# define __int32 int # define __int32 int
# endif # endif
# ifndef __int64 # ifndef __int64
# ifdef _WIN64 # if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long # define __int64 long
# else # else
# define __int64 long long # define __int64 long long

View File

@ -29,7 +29,7 @@ typedef unsigned short wchar_t;
#endif #endif
#if !defined(_MSC_VER) && !defined(__int64) #if !defined(_MSC_VER) && !defined(__int64)
# ifdef _WIN64 # if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long # define __int64 long
# else # else
# define __int64 long long # define __int64 long long

View File

@ -25,7 +25,7 @@ typedef unsigned short wchar_t;
#endif #endif
#if !defined(_MSC_VER) && !defined(__int64) #if !defined(_MSC_VER) && !defined(__int64)
# ifdef _WIN64 # if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long # define __int64 long
# else # else
# define __int64 long long # define __int64 long long

View File

@ -39,7 +39,7 @@
#endif #endif
#if !defined(_MSC_VER) && !defined(__int64) #if !defined(_MSC_VER) && !defined(__int64)
# ifdef _WIN64 # if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long # define __int64 long
# else # else
# define __int64 long long # define __int64 long long

View File

@ -30,7 +30,7 @@
#endif #endif
#if !defined(_MSC_VER) && !defined(__int64) #if !defined(_MSC_VER) && !defined(__int64)
# ifdef _WIN64 # if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long # define __int64 long
# else # else
# define __int64 long long # define __int64 long long

View File

@ -16,7 +16,7 @@
#endif #endif
#if !defined(_MSC_VER) && !defined(__int64) #if !defined(_MSC_VER) && !defined(__int64)
# ifdef _WIN64 # if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long # define __int64 long
# else # else
# define __int64 long long # define __int64 long long

View File

@ -28,7 +28,7 @@
#endif #endif
#if !defined(_MSC_VER) && !defined(__int64) #if !defined(_MSC_VER) && !defined(__int64)
# ifdef _WIN64 # if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long # define __int64 long
# else # else
# define __int64 long long # define __int64 long long

View File

@ -28,7 +28,7 @@
#endif #endif
#if !defined(_MSC_VER) && !defined(__int64) #if !defined(_MSC_VER) && !defined(__int64)
# ifdef _WIN64 # if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long # define __int64 long
# else # else
# define __int64 long long # define __int64 long long

View File

@ -22,7 +22,7 @@
#endif #endif
#if !defined(_MSC_VER) && !defined(__int64) #if !defined(_MSC_VER) && !defined(__int64)
# ifdef _WIN64 # if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long # define __int64 long
# else # else
# define __int64 long long # define __int64 long long

View File

@ -49,7 +49,7 @@ typedef struct
#endif #endif
#if !defined(_MSC_VER) && !defined(__int64) #if !defined(_MSC_VER) && !defined(__int64)
# ifdef _WIN64 # if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long # define __int64 long
# else # else
# define __int64 long long # define __int64 long long

View File

@ -23,7 +23,7 @@ typedef unsigned short wchar_t;
#endif #endif
#if !defined(_MSC_VER) && !defined(__int64) #if !defined(_MSC_VER) && !defined(__int64)
# ifdef _WIN64 # if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long # define __int64 long
# else # else
# define __int64 long long # define __int64 long long

View File

@ -28,7 +28,7 @@
#endif #endif
#if !defined(_MSC_VER) && !defined(__int64) #if !defined(_MSC_VER) && !defined(__int64)
# ifdef _WIN64 # if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long # define __int64 long
# else # else
# define __int64 long long # define __int64 long long

View File

@ -37,7 +37,7 @@ typedef unsigned short wchar_t;
#endif #endif
#if !defined(_MSC_VER) && !defined(__int64) #if !defined(_MSC_VER) && !defined(__int64)
# ifdef _WIN64 # if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long # define __int64 long
# else # else
# define __int64 long long # define __int64 long long

View File

@ -42,7 +42,7 @@ typedef unsigned short wchar_t;
#endif #endif
#if !defined(_MSC_VER) && !defined(__int64) #if !defined(_MSC_VER) && !defined(__int64)
# ifdef _WIN64 # if defined(_WIN64) && !defined(__MINGW64__)
# define __int64 long # define __int64 long
# else # else
# define __int64 long long # define __int64 long long

View File

@ -37,18 +37,19 @@ extern "C" {
/* Calling conventions definitions */ /* 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) #if defined(__x86_64__) && !defined(_WIN64)
#define _WIN64 #define _WIN64
#endif #endif
#ifndef _WIN64
# if defined(__i386__) && !defined(_X86_)
# define _X86_
# endif
# if defined(_X86_) && !defined(__i386__)
# define __i386__
# endif
#endif
#ifndef __stdcall #ifndef __stdcall
# ifdef __i386__ # ifdef __i386__
# ifdef __GNUC__ # ifdef __GNUC__