diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-22 13:02:12 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-22 13:02:12 +0000 |
| commit | 2446c474aae15bcaf31e4b799f94f21d515984d5 (patch) | |
| tree | 31c649543787afa72f5908dedf07ec8ae37a84a2 /xorg-server/xfixes | |
| parent | 0b44ee3fb92120190fa46e73b7abfbaa8a0adaec (diff) | |
| download | vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.gz vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.bz2 vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.zip | |
svn merge -r541:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/xfixes')
| -rw-r--r-- | xorg-server/xfixes/region.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/xorg-server/xfixes/region.c b/xorg-server/xfixes/region.c index 1b4accb3e..795caf013 100644 --- a/xorg-server/xfixes/region.c +++ b/xorg-server/xfixes/region.c @@ -26,10 +26,8 @@ #include "xfixesint.h" #include "scrnintstr.h" -#ifdef RENDER #include <picturestr.h> extern int RenderErrBase; -#endif #include <regionstr.h> #include <gcstruct.h> #include <window.h> @@ -265,7 +263,6 @@ SProcXFixesCreateRegionFromGC (ClientPtr client) int ProcXFixesCreateRegionFromPicture (ClientPtr client) { -#ifdef RENDER RegionPtr pRegion; PicturePtr pPicture; REQUEST (xXFixesCreateRegionFromPictureReq); @@ -296,9 +293,6 @@ ProcXFixesCreateRegionFromPicture (ClientPtr client) return BadAlloc; return(client->noClientException); -#else - return BadRequest; -#endif } int @@ -769,7 +763,6 @@ SProcXFixesSetWindowShapeRegion (ClientPtr client) int ProcXFixesSetPictureClipRegion (ClientPtr client) { -#ifdef RENDER PicturePtr pPicture; RegionPtr pRegion; ScreenPtr pScreen; @@ -785,9 +778,6 @@ ProcXFixesSetPictureClipRegion (ClientPtr client) return SetPictureClipRegion (pPicture, stuff->xOrigin, stuff->yOrigin, pRegion); -#else - return BadRequest; -#endif } int |