diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-04-15 09:58:01 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-04-15 09:58:01 +0200 |
| commit | 65543af56f4f97180b8dda998d5d7101d51ac1a3 (patch) | |
| tree | 48cfdcb6bd0cd8e5ed17fed56b55dd7f88ea8233 /nx-X11/lib/Xrender | |
| parent | 097562b8bbc04d421e0ab5e1e7a0b705e393c20e (diff) | |
| download | nx-libs-65543af56f4f97180b8dda998d5d7101d51ac1a3.tar.gz nx-libs-65543af56f4f97180b8dda998d5d7101d51ac1a3.tar.bz2 nx-libs-65543af56f4f97180b8dda998d5d7101d51ac1a3.zip | |
old-arch cleanup: Drop CRAY support (i.e., drop code related to CRAY, _CRAY, WORD64, WORD64ALIGN, MUSTCOPY definitions).
Diffstat (limited to 'nx-X11/lib/Xrender')
| -rw-r--r-- | nx-X11/lib/Xrender/FillRect.c | 15 | ||||
| -rw-r--r-- | nx-X11/lib/Xrender/Xrenderint.h | 7 |
2 files changed, 1 insertions, 21 deletions
diff --git a/nx-X11/lib/Xrender/FillRect.c b/nx-X11/lib/Xrender/FillRect.c index 319c35d57..75915379e 100644 --- a/nx-X11/lib/Xrender/FillRect.c +++ b/nx-X11/lib/Xrender/FillRect.c @@ -44,12 +44,6 @@ XRenderFillRectangle (Display *dpy, XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRectangle *rect; xRenderFillRectanglesReq *req; -#ifdef MUSTCOPY - xRectangle rectdata; - long len = SIZEOF(xRectangle); - - rect = &rectdata; -#endif /* MUSTCOPY */ RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); @@ -68,10 +62,8 @@ XRenderFillRectangle (Display *dpy, (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 { @@ -86,20 +78,13 @@ XRenderFillRectangle (Display *dpy, req->color.blue = color->blue; req->color.alpha = color->alpha; -#ifdef MUSTCOPY - dpy->bufptr -= SIZEOF(xRectangle); -#else rect = (xRectangle *) NEXTPTR(req,xRenderFillRectanglesReq); -#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(); } diff --git a/nx-X11/lib/Xrender/Xrenderint.h b/nx-X11/lib/Xrender/Xrenderint.h index 49a294b14..a90fe65d8 100644 --- a/nx-X11/lib/Xrender/Xrenderint.h +++ b/nx-X11/lib/Xrender/Xrenderint.h @@ -101,14 +101,9 @@ XRenderFindDisplay (Display *dpy); /* * Xlib uses long for 32-bit values. Xrender uses int. This - * matters on alpha. Note that this macro assumes that int is 32 bits - * except on WORD64 machines where it is 64 bits. + * matters on alpha. Note that this macro assumes that int is 32 bits. */ -#ifdef WORD64 -#define DataInt32(dpy,d,len) Data32(dpy,(long *) (d),len) -#else #define DataInt32(dpy,d,len) Data(dpy,(char *) (d),len) -#endif #endif /* _XRENDERINT_H_ */ |