diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-07-10 09:28:47 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2011-09-19 22:31:21 -0700 |
| commit | c96a43888ceae72bf89c66de911120c0b6b7a71a (patch) | |
| tree | 05cd4ccc68326e54dda806e6f1c07d950767a3b7 /dix | |
| parent | 87cc83474d9890d14d9bc60926a97bd0d5b059af (diff) | |
Revert "Bug #6924: Restore the ABI for DrawableRec and ColormapRec to the state"
This reverts commit bc0c56c407117d1545e20d21f7d30eb3472d618b since we're
breaking ABI anyway.
Conflicts:
ChangeLog
dix/colormap.c
dix/pixmap.c
dix/window.c
include/pixmapstr.h
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/colormap.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/dix/colormap.c b/dix/colormap.c index 0e1feb6c4..038457d3d 100644 --- a/dix/colormap.c +++ b/dix/colormap.c @@ -287,13 +287,6 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual, 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); |