From ec8f6b7a26318e1e419ece49eaaaf020c925e23e Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 8 Aug 2025 17:22:58 +0200 Subject: [PATCH] dix: fix int type mismatch on CURSOR_REC_SIZE and CURSOR_BITS_SIZE Signed-off-by: Enrico Weigelt, metux IT consult --- include/cursorstr.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/cursorstr.h b/include/cursorstr.h index 638cf4bde4..df6dd9516f 100644 --- a/include/cursorstr.h +++ b/include/cursorstr.h @@ -80,7 +80,11 @@ typedef struct _Cursor { Atom name; } CursorRec; +<<<<<<< HEAD #define CURSOR_REC_SIZE (sizeof(CursorRec) + (size_t)dixPrivatesSize(PRIVATE_CURSOR)) +======= +#define CURSOR_REC_SIZE (sizeof(CursorRec) + (unsigned int)dixPrivatesSize(PRIVATE_CURSOR)) +>>>>>>> 3bdc69db04 (dix: fix int type mismatch on CURSOR_REC_SIZE and CURSOR_BITS_SIZE) typedef struct _CursorMetric { unsigned short width, height, xhot, yhot;