Module: vkd3d Branch: master Commit: 3ec487d93a3e726475bfbb388198faccd54d2d85 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3ec487d93a3e726475bfbb38...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Fri May 29 16:37:30 2020 +0430
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
---
include/vkd3d_windows.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 7d63ead..ad2f08a 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -33,8 +33,11 @@
#if !defined(_WIN32) || defined(__WIDL__)
-# if !defined(__WIDL__) && !defined(VKD3D_WIN32_WCHAR) -# include <wchar.h> +# if !defined(__WIDL__) +# if !defined(VKD3D_WIN32_WCHAR) +# include <wchar.h> +# endif +# include <stdint.h> # endif
# ifdef __GNUC__ @@ -79,12 +82,12 @@ typedef short INT16; typedef unsigned short UINT16; typedef int INT32; typedef unsigned int UINT32; -# if defined(__x86_64__) || defined(__WIDL__) -typedef long INT64; -typedef unsigned long UINT64; +# if defined(__WIDL__) +typedef __int64 INT64; +typedef unsigned __int64 UINT64; # else -typedef long long DECLSPEC_ALIGN(8) INT64; -typedef unsigned long long DECLSPEC_ALIGN(8) UINT64; +typedef int64_t DECLSPEC_ALIGN(8) INT64; +typedef uint64_t DECLSPEC_ALIGN(8) UINT64; # endif typedef long LONG_PTR; typedef unsigned long ULONG_PTR;