diff options
Diffstat (limited to 'nx-X11/lib/Xrender')
| -rw-r--r-- | nx-X11/lib/Xrender/FillRect.c | 15 | ||||
| -rw-r--r-- | nx-X11/lib/Xrender/Imakefile | 9 | ||||
| -rw-r--r-- | nx-X11/lib/Xrender/Xrenderint.h | 7 | ||||
| -rw-r--r-- | nx-X11/lib/Xrender/config-subst | 10 |
4 files changed, 12 insertions, 29 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/Imakefile b/nx-X11/lib/Xrender/Imakefile index c4fd0aa67..72d149a20 100644 --- a/nx-X11/lib/Xrender/Imakefile +++ b/nx-X11/lib/Xrender/Imakefile @@ -26,13 +26,6 @@ XCOMM NONSTANDARD_HEADERS below. #define SharedXrenderRev 1.1 SOXRENDERREV = SharedXrenderRev -#if SharedLibXrender -#define SharedXft1Rev 1.2 -SharedLibReferences(XFT1,Xft,$(XFT1SRC),SOXFT1REV,SharedXft1Rev) -#else -ProjectUnsharedLibReferences(XFT1,Xft,$(XFT1SRC),BuildLibDir) -#endif - #undef LinkBuildLibrary #define LinkBuildLibrary(lib) MakeDir($(BUILDLIBDIR)) @@\ RemoveFile($(BUILDLIBDIR)/lib) @@\ @@ -159,7 +152,7 @@ all:: xrender.pc xrender.pc: xrender.pc.in RemoveFile($@) - sh ../Xcursor/config-subst $(SUBSTVARS) < xrender.pc.in > $@ + sh config-subst $(SUBSTVARS) < xrender.pc.in > $@ InstallNonExecFile(xrender.pc,$(USRLIBDIR)/pkgconfig) 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_ */ diff --git a/nx-X11/lib/Xrender/config-subst b/nx-X11/lib/Xrender/config-subst new file mode 100644 index 000000000..5907e0328 --- /dev/null +++ b/nx-X11/lib/Xrender/config-subst @@ -0,0 +1,10 @@ +#!/bin/sh +script=config-subst.$$ +trap "rm $script" 0 +rm -f $script +for i in ${1+"$@"}; do + var="`echo "$i" | sed 's/=.*$//'`" + val="`echo "$i" | sed 's/^[^=]*=//'`" + echo "s;@$var@;$val;" >> $script +done +sed -f $script |