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 | |
| 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>
| -rw-r--r-- | dix/colormap.c | 7 | ||||
| -rw-r--r-- | include/colormapst.h | 17 |
2 files changed, 2 insertions, 22 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); diff --git a/include/colormapst.h b/include/colormapst.h index b597e2c60..bb79c86d2 100644 --- a/include/colormapst.h +++ b/include/colormapst.h @@ -48,8 +48,6 @@ SOFTWARE. #ifndef CMAPSTRUCT_H #define CMAPSTRUCT_H 1 -#include <X11/Xarch.h> - #include "colormap.h" #include "screenint.h" #include "privates.h" @@ -91,26 +89,15 @@ typedef struct _CMEntry Bool fShared; } Entry; -/* - * COLORMAPs can be used for either Direct or Pseudo color. PseudoColor +/* COLORMAPs can be used for either Direct or Pseudo color. PseudoColor * only needs one cell table, we arbitrarily pick red. We keep track - * of that table with freeRed, numPixelsRed, and clientPixelsRed - * - * The padN variables are unfortunate ABI BC. See fdo bug #6924. - */ + * of that table with freeRed, numPixelsRed, and clientPixelsRed */ typedef struct _ColormapRec { VisualPtr pVisual; short class; /* PseudoColor or DirectColor */ -#if defined(_LP64) - short pad0; - XID pad1; -#endif XID mid; /* client's name for colormap */ -#if defined(_LP64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN) - XID pad2; -#endif ScreenPtr pScreen; /* screen map is associated with */ short flags; /* 1 = IsDefault * 2 = AllAllocated */ |