aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/dix/pixmap.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-11-04 23:51:30 +0100
committerMihai Moldovan <ionic@ionic.de>2018-02-26 04:54:35 +0100
commit50a33794069fd22e615f6208cd4c82a64452b485 (patch)
treec272cfb28c3d5c1940332d118993514907993188 /nx-X11/programs/Xserver/dix/pixmap.c
parentb40dec982d17b010cedc183ebdc4c75ca7de785f (diff)
downloadnx-libs-50a33794069fd22e615f6208cd4c82a64452b485.tar.gz
nx-libs-50a33794069fd22e615f6208cd4c82a64452b485.tar.bz2
nx-libs-50a33794069fd22e615f6208cd4c82a64452b485.zip
Lift dix to xorg-xserver-7.1/1.1.0 state
Diffstat (limited to 'nx-X11/programs/Xserver/dix/pixmap.c')
-rw-r--r--nx-X11/programs/Xserver/dix/pixmap.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/dix/pixmap.c b/nx-X11/programs/Xserver/dix/pixmap.c
index 709f413ed..f13473498 100644
--- a/nx-X11/programs/Xserver/dix/pixmap.c
+++ b/nx-X11/programs/Xserver/dix/pixmap.c
@@ -146,5 +146,13 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
#else
pPixmap = (PixmapPtr)calloc(1, sizeof(PixmapRec) + pixDataSize);
#endif
+
+#ifdef _XSERVER64
+ if (pPixmap) {
+ pPixmap->drawable.pad0 = 0;
+ pPixmap->drawable.pad1 = 0;
+ }
+#endif
+
return pPixmap;
}