mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-25 08:29:23 +00:00
dix: fix int type mismatch on CURSOR_REC_SIZE and CURSOR_BITS_SIZE
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user