include: Use standard 64-bit types.

In particular, we want these to be consistent with PRIx64. On 64-bit
macOS, that's "llx".

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet
2020-05-29 16:19:30 +04:30
committed by Alexandre Julliard
parent 5d5a458247
commit 3ec487d93a

View File

@ -33,8 +33,11 @@
#if !defined(_WIN32) || defined(__WIDL__) #if !defined(_WIN32) || defined(__WIDL__)
# if !defined(__WIDL__) && !defined(VKD3D_WIN32_WCHAR) # if !defined(__WIDL__)
# include <wchar.h> # if !defined(VKD3D_WIN32_WCHAR)
# include <wchar.h>
# endif
# include <stdint.h>
# endif # endif
# ifdef __GNUC__ # ifdef __GNUC__
@ -79,12 +82,12 @@ typedef short INT16;
typedef unsigned short UINT16; typedef unsigned short UINT16;
typedef int INT32; typedef int INT32;
typedef unsigned int UINT32; typedef unsigned int UINT32;
# if defined(__x86_64__) || defined(__WIDL__) # if defined(__WIDL__)
typedef long INT64; typedef __int64 INT64;
typedef unsigned long UINT64; typedef unsigned __int64 UINT64;
# else # else
typedef long long DECLSPEC_ALIGN(8) INT64; typedef int64_t DECLSPEC_ALIGN(8) INT64;
typedef unsigned long long DECLSPEC_ALIGN(8) UINT64; typedef uint64_t DECLSPEC_ALIGN(8) UINT64;
# endif # endif
typedef long LONG_PTR; typedef long LONG_PTR;
typedef unsigned long ULONG_PTR; typedef unsigned long ULONG_PTR;