aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/FillRct.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-03-04 09:37:48 +0100
committermarha <marha@users.sourceforge.net>2013-03-04 09:37:48 +0100
commited474047e06f28fe740130f3bb13d3a40f4833a9 (patch)
tree35a48f61c00ebb1f0579159c25dbbd1bfe812849 /libX11/src/FillRct.c
parent3c0e16af61a9e0b6f9edab1d403adfaa85456599 (diff)
parentd4d629b77742e60caac3d120ff40e9f386380af2 (diff)
downloadvcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.tar.gz
vcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.tar.bz2
vcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig libX11 mesalib pixman xserver xkeyboard-config git update 4 Mar 2013 Conflicts: libX11/src/xkb/XKBGAlloc.c libX11/src/xkb/XKBMisc.c
Diffstat (limited to 'libX11/src/FillRct.c')
-rw-r--r--libX11/src/FillRct.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/libX11/src/FillRct.c b/libX11/src/FillRct.c
index 4cd104cb1..3ca9afe9e 100644
--- a/libX11/src/FillRct.c
+++ b/libX11/src/FillRct.c
@@ -44,12 +44,6 @@ XFillRectangle(
unsigned int height) /* CARD16 */
{
xRectangle *rect;
-#ifdef MUSTCOPY
- xRectangle rectdata;
- long len = SIZEOF(xRectangle);
-
- rect = &rectdata;
-#endif /* MUSTCOPY */
LockDisplay(dpy);
FlushGC(dpy, gc);
@@ -66,30 +60,21 @@ XFillRectangle(
&& ((dpy->bufptr + SIZEOF(xRectangle)) <= dpy->bufmax)
&& (((char *)dpy->bufptr - (char *)req) < size) ) {
req->length += SIZEOF(xRectangle) >> 2;
-#ifndef MUSTCOPY
rect = (xRectangle *) dpy->bufptr;
dpy->bufptr += SIZEOF(xRectangle);
-#endif /* not MUSTCOPY */
}
else {
GetReqExtra(PolyFillRectangle, SIZEOF(xRectangle), req);
req->drawable = d;
req->gc = gc->gid;
-#ifdef MUSTCOPY
- dpy->bufptr -= SIZEOF(xRectangle);
-#else
rect = (xRectangle *) NEXTPTR(req,xPolyFillRectangleReq);
-#endif /* MUSTCOPY */
}
rect->x = x;
rect->y = y;
rect->width = width;
rect->height = height;
-#ifdef MUSTCOPY
- Data (dpy, (char *) rect, len);
-#endif /* MUSTCOPY */
}
UnlockDisplay(dpy);
SyncHandle();