diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-05-22 15:47:56 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-05-22 15:47:56 +0000 |
| commit | bc0c56c407117d1545e20d21f7d30eb3472d618b (patch) | |
| tree | cb7df5ccbd520f2727b2b91ac18e65a59aed9bf5 /include/pixmapstr.h | |
| parent | cc3b882bd141218052cdde0144fc2a707ceee83d (diff) | |
Bug #6924: Restore the ABI for DrawableRec and ColormapRec to the state
they were in prior to the fix for #6438. Based on a patch from Andy
Ritger.
Diffstat (limited to 'include/pixmapstr.h')
| -rw-r--r-- | include/pixmapstr.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/pixmapstr.h b/include/pixmapstr.h index 272ce6869..291f2a2e9 100644 --- a/include/pixmapstr.h +++ b/include/pixmapstr.h @@ -49,16 +49,27 @@ SOFTWARE. #ifndef PIXMAPSTRUCT_H #define PIXMAPSTRUCT_H +#include <X11/Xarch.h> #include "pixmap.h" #include "screenint.h" #include "regionstr.h" +/* + * The padN members are unfortunate ABI BC. See fdo bug #6924. + */ + typedef struct _Drawable { unsigned char type; /* DRAWABLE_<type> */ unsigned char class; /* specific to type */ unsigned char depth; unsigned char bitsPerPixel; +#if defined(_XSERVER64) + XID pad0; +#endif XID id; /* resource id */ +#if defined(_XSERVER64) + XID pad1; +#endif short x; /* window: screen absolute, pixmap: 0 */ short y; /* window: screen absolute, pixmap: 0 */ unsigned short width; |