diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-22 15:20:09 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-22 15:20:09 +0200 |
| commit | c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983 (patch) | |
| tree | 8874978d314129a4f47ee575b076c2d8eb1a8738 /xorg-server/include/colormapst.h | |
| parent | 37466741e35c5eb3b204863a5023bf8d192efc06 (diff) | |
| download | vcxsrv-c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983.tar.gz vcxsrv-c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983.tar.bz2 vcxsrv-c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983.zip | |
libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011
Diffstat (limited to 'xorg-server/include/colormapst.h')
| -rw-r--r-- | xorg-server/include/colormapst.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/xorg-server/include/colormapst.h b/xorg-server/include/colormapst.h index b597e2c60..bb79c86d2 100644 --- a/xorg-server/include/colormapst.h +++ b/xorg-server/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 */ |