diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 05:12:20 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 05:12:20 +0100 |
| commit | a9787fc2e79065e8f56fdace41f4e565667c22bb (patch) | |
| tree | 19559f26bed90d12689ee47145b27fcd7619820a /nx-X11/programs/Xserver/include/pixmapstr.h | |
| parent | b40dec982d17b010cedc183ebdc4c75ca7de785f (diff) | |
| parent | 6dcfcbabe6b87467a6f811d0dc03efba7bfce8e4 (diff) | |
| download | nx-libs-a9787fc2e79065e8f56fdace41f4e565667c22bb.tar.gz nx-libs-a9787fc2e79065e8f56fdace41f4e565667c22bb.tar.bz2 nx-libs-a9787fc2e79065e8f56fdace41f4e565667c22bb.zip | |
Merge branch 'uli42-pr/update_dix' into 3.6.x
Attributes GH PR #646: https://github.com/ArcticaProject/nx-libs/pull/646
Diffstat (limited to 'nx-X11/programs/Xserver/include/pixmapstr.h')
| -rw-r--r-- | nx-X11/programs/Xserver/include/pixmapstr.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/include/pixmapstr.h b/nx-X11/programs/Xserver/include/pixmapstr.h index 5d38c1c3b..d7f934a34 100644 --- a/nx-X11/programs/Xserver/include/pixmapstr.h +++ b/nx-X11/programs/Xserver/include/pixmapstr.h @@ -47,16 +47,27 @@ SOFTWARE. #ifndef PIXMAPSTRUCT_H #define PIXMAPSTRUCT_H +#include <nx-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; - unsigned long id; /* resource id */ +#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; |