diff options
Diffstat (limited to 'nx-X11/programs/Xserver/include/colormapst.h')
| -rw-r--r-- | nx-X11/programs/Xserver/include/colormapst.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/include/colormapst.h b/nx-X11/programs/Xserver/include/colormapst.h index a8fa055de..d26987581 100644 --- a/nx-X11/programs/Xserver/include/colormapst.h +++ b/nx-X11/programs/Xserver/include/colormapst.h @@ -48,6 +48,8 @@ SOFTWARE. #ifndef CMAPSTRUCT_H #define CMAPSTRUCT_H 1 +#include <nx-X11/Xarch.h> + #include "colormap.h" #include "screenint.h" @@ -88,15 +90,26 @@ 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 */ + * of that table with freeRed, numPixelsRed, and clientPixelsRed + * + * The padN variables are unfortunate ABI BC. See fdo bug #6924. + */ typedef struct _ColormapRec { VisualPtr pVisual; short class; /* PseudoColor or DirectColor */ - long mid; /* client's name for colormap */ +#if defined(_XSERVER64) + short pad0; + XID pad1; +#endif + XID mid; /* client's name for colormap */ +#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN) + XID pad2; +#endif ScreenPtr pScreen; /* screen map is associated with */ short flags; /* 1 = IsDefault * 2 = AllAllocated */ |