summaryrefslogtreecommitdiff
path: root/dix/pixmap.c
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-05-22 15:47:56 +0000
committerAdam Jackson <ajax@nwnk.net>2006-05-22 15:47:56 +0000
commitbc0c56c407117d1545e20d21f7d30eb3472d618b (patch)
treecb7df5ccbd520f2727b2b91ac18e65a59aed9bf5 /dix/pixmap.c
parentcc3b882bd141218052cdde0144fc2a707ceee83d (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 'dix/pixmap.c')
-rw-r--r--dix/pixmap.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/dix/pixmap.c b/dix/pixmap.c
index 527b0f0b2..1c3d49fc5 100644
--- a/dix/pixmap.c
+++ b/dix/pixmap.c
@@ -141,5 +141,13 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
#else
pPixmap = (PixmapPtr)xalloc(sizeof(PixmapRec) + pixDataSize);
#endif
+
+#ifdef _XSERVER64
+ if (pPixmap) {
+ pPixmap->drawable.pad0 = 0;
+ pPixmap->drawable.pad1 = 0;
+ }
+#endif
+
return pPixmap;
}