Sure, why not? This is the first ABI break since server-1.11 that I've seen go out to the list, I think, but it seems naive to assume there won't be more.
Reviewed-by: Aaron Plattner <aplatt...@nvidia.com> On Sat, Sep 17, 2011 at 01:22:31AM -0700, Jamey Sharp wrote: > 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 <ja...@minilop.net> > --- > dix/colormap.c | 7 ------- > include/colormapst.h | 17 ++--------------- > 2 files changed, 2 insertions(+), 22 deletions(-) > > diff --git a/dix/colormap.c b/dix/colormap.c > index 0e1feb6..038457d 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 b597e2c..bb79c86 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 */ > -- > 1.7.5.4 > > _______________________________________________ > xorg-devel@lists.x.org: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel > _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel