aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xext/shape.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-04-27 13:04:40 +0000
committermarha <marha@users.sourceforge.net>2010-04-27 13:04:40 +0000
commit9691d196c34d551ebc33843692afd0ee23b9389b (patch)
tree184412bc028d5e4b62492d4c95a899b35e600692 /xorg-server/Xext/shape.c
parentf49a8c2a1f02f8089d709ec8dcf7080c041baf0c (diff)
downloadvcxsrv-9691d196c34d551ebc33843692afd0ee23b9389b.tar.gz
vcxsrv-9691d196c34d551ebc33843692afd0ee23b9389b.tar.bz2
vcxsrv-9691d196c34d551ebc33843692afd0ee23b9389b.zip
svn merge -r549:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/Xext/shape.c')
-rw-r--r--xorg-server/Xext/shape.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/Xext/shape.c b/xorg-server/Xext/shape.c
index 85cc9b932..3a7dad5d7 100644
--- a/xorg-server/Xext/shape.c
+++ b/xorg-server/Xext/shape.c
@@ -367,7 +367,7 @@ ProcPanoramiXShapeRectangles(
FOR_NSCREENS(j) {
stuff->dest = win->info[j].id;
result = ProcShapeRectangles (client);
- BREAK_IF(result != Success);
+ if (result != Success) break;
}
return (result);
}
@@ -476,7 +476,7 @@ ProcPanoramiXShapeMask(
if(pmap)
stuff->src = pmap->info[j].id;
result = ProcShapeMask (client);
- BREAK_IF(result != Success);
+ if (result != Success) break;
}
return (result);
}
@@ -602,7 +602,7 @@ ProcPanoramiXShapeCombine(
stuff->dest = win->info[j].id;
stuff->src = win2->info[j].id;
result = ProcShapeCombine (client);
- BREAK_IF(result != Success);
+ if (result != Success) break;
}
return (result);
}