diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/xfixes/region.c | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/xfixes/region.c')
| -rw-r--r-- | xorg-server/xfixes/region.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/xorg-server/xfixes/region.c b/xorg-server/xfixes/region.c index d90b1e0ff..cac24b5da 100644 --- a/xorg-server/xfixes/region.c +++ b/xorg-server/xfixes/region.c @@ -169,20 +169,16 @@ ProcXFixesCreateRegionFromWindow (ClientPtr client) } switch (stuff->kind) { case WindowRegionBounding: -#ifdef SHAPE pRegion = wBoundingShape(pWin); if (!pRegion) -#endif { pRegion = CreateBoundingShape (pWin); copy = FALSE; } break; case WindowRegionClip: -#ifdef SHAPE pRegion = wClipShape(pWin); if (!pRegion) -#endif { pRegion = CreateClipShape (pWin); copy = FALSE; @@ -678,7 +674,6 @@ typedef RegionPtr (*CreateDftPtr)(WindowPtr pWin); int ProcXFixesSetWindowShapeRegion (ClientPtr client) { -#ifdef SHAPE WindowPtr pWin; ScreenPtr pScreen; RegionPtr pRegion; @@ -753,9 +748,6 @@ ProcXFixesSetWindowShapeRegion (ClientPtr client) (*pScreen->SetShape) (pWin); SendShapeNotify (pWin, stuff->destKind); return (client->noClientException); -#else - return BadRequest; -#endif } int |