Alexandre Julliard : include: Define LONG_PTR as int on llvm-mingw to avoid printf format warnings.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bb1266b276b0ad51d53ac8a49bc1e6169d5dd7f8
URL:    https://gitlab.winehq.org/wine/wine/-/commit/bb1266b276b0ad51d53ac8a49bc1e61...

Author: Alexandre Julliard 
Date:   Wed Jul  5 12:14:50 2023 +0200

include: Define LONG_PTR as int on llvm-mingw to avoid printf format warnings.

---

include/basetsd.h | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/include/basetsd.h b/include/basetsd.h
index 6a6a3945205..55e900d4f8e 100644
--- a/include/basetsd.h
+++ b/include/basetsd.h
@@ -122,15 +122,15 @@ typedef unsigned __int64 ULONG_PTR, *PULONG_PTR;

#define __int3264 __int32

-#ifdef WINE_NO_LONG_TYPES
-typedef long          INT_PTR, *PINT_PTR;
-typedef unsigned long UINT_PTR, *PUINT_PTR;
-#else
 typedef int           INT_PTR, *PINT_PTR;
 typedef unsigned int  UINT_PTR, *PUINT_PTR;
-#endif
+#if defined(__clang__) && defined(__MINGW32__)  /* llvm-mingw warns about long type in %I formats */
+typedef int           LONG_PTR, *PLONG_PTR;
+typedef unsigned int  ULONG_PTR, *PULONG_PTR;
+#else
 typedef long          LONG_PTR, *PLONG_PTR;
 typedef unsigned long ULONG_PTR, *PULONG_PTR;
+#endif

#endif

@@ -142,8 +142,6 @@ typedef unsigned long ULONG_PTR, *PULONG_PTR;
 #define MININT_PTR 0x8000000000000000
 #define MAXUINT_PTR 0xffffffffffffffff

-typedef __int64 SHANDLE_PTR;
-typedef unsigned __int64 HANDLE_PTR;
 typedef int HALF_PTR, *PHALF_PTR;
 typedef unsigned int UHALF_PTR, *PUHALF_PTR;

@@ -259,8 +257,6 @@ static inline void *ULongToPtr(ULONG32 ul)
 #define MININT_PTR 0x80000000
 #define MAXUINT_PTR 0xffffffff

-typedef long SHANDLE_PTR;
-typedef unsigned long HANDLE_PTR;
 typedef signed short HALF_PTR, *PHALF_PTR;
 typedef unsigned short UHALF_PTR, *PUHALF_PTR;

@@ -290,6 +286,8 @@ typedef unsigned short UHALF_PTR, *PUHALF_PTR;
 #define UintToPtr(ui)           UIntToPtr(ui)
 #define UlongToPtr(ul)          ULongToPtr(ul)

+typedef LONG_PTR SHANDLE_PTR;
+typedef ULONG_PTR HANDLE_PTR;
 typedef LONG_PTR SSIZE_T, *PSSIZE_T;
 typedef ULONG_PTR SIZE_T, *PSIZE_T;
 typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR;