On Fri, 2011-01-07 at 00:51 +0100, Mark Kettenis wrote:
> > --- a/include/colormapst.h
> > +++ b/include/colormapst.h
> > @@ -103,12 +103,12 @@ typedef struct _ColormapRec
> > {
> > VisualPtr pVisual;
> > short class; /* PseudoColor or DirectColor */
> > -#if defined(_XSERVER64)
> > +#if defined(_LP64)
> > short pad0;
> > XID pad1;
> > #endif
> > XID mid; /* client's name for colormap */
> > -#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
> > +#if defined(_LP64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
> > XID pad2;
> > #endif
> > ScreenPtr pScreen; /* screen map is associated with */
>
> This bit puzzles me. Can you explain why it is necessary if
> xorg-server.h continues to define _XSERVER64 when appropriate?
Not strictly necessary I suppose, but xorg-server.h doesn't get pulled
in by any other header, so, might as well rely on the compiler's
predefines instead.
> > @@ -187,4 +184,8 @@
> > /* X Access Control Extension */
> > #undef XACE
> >
> > +#ifdef _LP64
> > +#define _XSERVER64 1
> > +#endif
> > +
> > #endif /* _XORG_SERVER_H_ */
>
> I suppose there is some configure magic somewhere that replaces #undef
> _XSERVER64 on LP64 platforms. Is that code now redundant?
Indeed there is, and indeed it is. Will resend with that taken out too.
- ajax
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
