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/dix/colormap.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'nx-X11/programs/Xserver/dix/colormap.c') diff --git a/nx-X11/programs/Xserver/dix/colormap.c b/nx-X11/programs/Xserver/dix/colormap.c index 81b93d2de..42ba8002a 100644 --- a/nx-X11/programs/Xserver/dix/colormap.c +++ b/nx-X11/programs/Xserver/dix/colormap.c @@ -273,6 +273,13 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual, pmap = (ColormapPtr) malloc(sizebytes); if (!pmap) return (BadAlloc); +#if defined(_XSERVER64) + pmap->pad0 = 0; + pmap->pad1 = 0; +#if (X_BYTE_ORDER == X_LITTLE_ENDIAN) + pmap->pad2 = 0; +#endif +#endif pmap->red = (EntryPtr)((char *)pmap + sizeof(ColormapRec)); sizebytes = size * sizeof(Entry); pmap->clientPixelsRed = (Pixel **)((char *)pmap->red + sizebytes); -- cgit v1.2.3