From 50a33794069fd22e615f6208cd4c82a64452b485 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 4 Nov 2017 23:51:30 +0100 Subject: Lift dix to xorg-xserver-7.1/1.1.0 state --- nx-X11/programs/Xserver/include/pixmapstr.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/include/pixmapstr.h') diff --git a/nx-X11/programs/Xserver/include/pixmapstr.h b/nx-X11/programs/Xserver/include/pixmapstr.h index 5d38c1c3b..d7f934a34 100644 --- a/nx-X11/programs/Xserver/include/pixmapstr.h +++ b/nx-X11/programs/Xserver/include/pixmapstr.h @@ -47,16 +47,27 @@ SOFTWARE. #ifndef PIXMAPSTRUCT_H #define PIXMAPSTRUCT_H +#include #include "pixmap.h" #include "screenint.h" #include "regionstr.h" +/* + * The padN members are unfortunate ABI BC. See fdo bug #6924. + */ + typedef struct _Drawable { unsigned char type; /* DRAWABLE_ */ unsigned char class; /* specific to type */ unsigned char depth; unsigned char bitsPerPixel; - unsigned long id; /* resource id */ +#if defined(_XSERVER64) + XID pad0; +#endif + XID id; /* resource id */ +#if defined(_XSERVER64) + XID pad1; +#endif short x; /* window: screen absolute, pixmap: 0 */ short y; /* window: screen absolute, pixmap: 0 */ unsigned short width; -- cgit v1.2.3