aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-05-01 10:40:47 +0200
committerUlrich Sibiller <uli42@gmx.de>2019-06-12 18:45:02 +0200
commit3900ba3f8459c4822eaa6b8ac6035980a63fdfff (patch)
tree2e3baa88000f7e24d7c928000400087dd236eff5
parentb961e190bc69bc93cb1f3fd6cbff7e9c1247de25 (diff)
downloadnx-libs-3900ba3f8459c4822eaa6b8ac6035980a63fdfff.tar.gz
nx-libs-3900ba3f8459c4822eaa6b8ac6035980a63fdfff.tar.bz2
nx-libs-3900ba3f8459c4822eaa6b8ac6035980a63fdfff.zip
NXshm.c: remove left-overs from patch
format was broken, would not compile
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXshm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
index 246d39355..9a314391c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
@@ -387,8 +387,8 @@ ProcShmPutImage(client)
((stuff->format != ZPixmap) &&
(stuff->srcX < screenInfo.bitmapScanlinePad) &&
((stuff->format == XYBitmap) ||
- - ((stuff->srcY == 0) &&
- - (stuff->srcHeight == stuff->totalHeight))))) &&
+ ((stuff->srcY == 0) &&
+ (stuff->srcHeight == stuff->totalHeight))))) &&
((stuff->srcX + stuff->srcWidth) == stuff->totalWidth))
(*pGC->ops->PutImage) (pDraw, pGC, stuff->depth,
stuff->dstX, stuff->dstY,
@@ -396,7 +396,7 @@ ProcShmPutImage(client)
stuff->srcX, stuff->format,
shmdesc->addr + stuff->offset +
(stuff->srcY * length));
-- else
+ else
#endif
{
#ifdef TEST