From ab7fbd08a7c82aeb9f9c2dda49b59f23f2cf794e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Thu, 24 Oct 2024 12:03:37 +0200 Subject: [PATCH] [WINE/MSVCRT] Fix MSVCRT_size_t, MSVCRT_intptr_t and MSVCRT_uintptr_t typedefs (#6464) Make these definitions compatible with the other ambient size_t and (u)intptr_t types used in the rest of our code base. This partly reverts the corresponding typedef changes from wine commit https://github.com/wine-mirror/wine/commit/d8ab5a14aac6d8f9dc493225e352a45784970003 "msvcrt: Use intptr_t or size_t instead of long where appropriate." --- modules/rostests/winetests/msvcrt/msvcrt.h | 6 +++--- sdk/lib/crt/wine/msvcrt.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/rostests/winetests/msvcrt/msvcrt.h b/modules/rostests/winetests/msvcrt/msvcrt.h index 66f6bd00e96..2a158cb4541 100644 --- a/modules/rostests/winetests/msvcrt/msvcrt.h +++ b/modules/rostests/winetests/msvcrt/msvcrt.h @@ -64,9 +64,9 @@ typedef unsigned __int64 MSVCRT_size_t; typedef __int64 MSVCRT_intptr_t; typedef unsigned __int64 MSVCRT_uintptr_t; #else -typedef unsigned long MSVCRT_size_t; -typedef long MSVCRT_intptr_t; -typedef unsigned long MSVCRT_uintptr_t; +typedef unsigned int MSVCRT_size_t; +typedef int MSVCRT_intptr_t; +typedef unsigned int MSVCRT_uintptr_t; #endif typedef unsigned int MSVCRT__dev_t; typedef int MSVCRT__off_t; diff --git a/sdk/lib/crt/wine/msvcrt.h b/sdk/lib/crt/wine/msvcrt.h index 47199794248..10d98c44dbf 100644 --- a/sdk/lib/crt/wine/msvcrt.h +++ b/sdk/lib/crt/wine/msvcrt.h @@ -80,9 +80,9 @@ typedef unsigned __int64 MSVCRT_size_t; typedef __int64 MSVCRT_intptr_t; typedef unsigned __int64 MSVCRT_uintptr_t; #else -typedef unsigned long MSVCRT_size_t; -typedef long MSVCRT_intptr_t; -typedef unsigned long MSVCRT_uintptr_t; +typedef unsigned int MSVCRT_size_t; +typedef int MSVCRT_intptr_t; +typedef unsigned int MSVCRT_uintptr_t; #endif #ifdef _CRTDLL typedef short MSVCRT__dev_t;