aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/composite
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-04-10 16:33:27 +0200
committerMihai Moldovan <ionic@ionic.de>2017-04-10 16:33:27 +0200
commit2d700b147a94fbb92ad9ad90b265a3bc1ceca6e3 (patch)
tree563d66344108d7b00cbf01068cd3e6a88017b0e9 /nx-X11/programs/Xserver/composite
parentcc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa (diff)
parent8b5bb2cdafe5f7bd77826a1fd28f07b7329be899 (diff)
downloadnx-libs-2d700b147a94fbb92ad9ad90b265a3bc1ceca6e3.tar.gz
nx-libs-2d700b147a94fbb92ad9ad90b265a3bc1ceca6e3.tar.bz2
nx-libs-2d700b147a94fbb92ad9ad90b265a3bc1ceca6e3.zip
Merge branch 'sunweaver-pr/createpixmap-alloc-hints-abi-change' into 3.6.x
Attributes GH PR #410: https://github.com/ArcticaProject/nx-libs/pull/410
Diffstat (limited to 'nx-X11/programs/Xserver/composite')
-rw-r--r--nx-X11/programs/Xserver/composite/compalloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/composite/compalloc.c b/nx-X11/programs/Xserver/composite/compalloc.c
index e24c490d2..22b036265 100644
--- a/nx-X11/programs/Xserver/composite/compalloc.c
+++ b/nx-X11/programs/Xserver/composite/compalloc.c
@@ -539,8 +539,8 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)
PixmapPtr pPixmap;
/* usage_hint unsupported by our old server infrastructure. */
- pPixmap = (*pScreen->CreatePixmap) (pScreen, w, h, pWin->drawable.depth /*,
- CREATE_PIXMAP_USAGE_BACKING_PIXMAP */);
+ pPixmap = (*pScreen->CreatePixmap) (pScreen, w, h, pWin->drawable.depth,
+ CREATE_PIXMAP_USAGE_BACKING_PIXMAP);
if (!pPixmap)
return 0;