diff options
| author | faith <faith> | 2000-01-06 12:41:09 +0000 |
|---|---|---|
| committer | faith <faith> | 2000-01-06 12:41:09 +0000 |
| commit | 0387caff984518490a7dc7834a184390bbf4fb97 (patch) | |
| tree | 3e384e8272b323453802e0cb015c3e28e1077174 /xc/programs/Xserver/hw/xnest | |
| parent | b700746a28cb32d457c7aae74d8d04ffd0e4ab5d (diff) | |
Import of XFree86 3.9.17
Diffstat (limited to 'xc/programs/Xserver/hw/xnest')
| -rw-r--r-- | xc/programs/Xserver/hw/xnest/GC.c | 7 | ||||
| -rw-r--r-- | xc/programs/Xserver/hw/xnest/Imakefile | 10 |
2 files changed, 6 insertions, 11 deletions
diff --git a/xc/programs/Xserver/hw/xnest/GC.c b/xc/programs/Xserver/hw/xnest/GC.c index 4916bce9c..e7d6c18da 100644 --- a/xc/programs/Xserver/hw/xnest/GC.c +++ b/xc/programs/Xserver/hw/xnest/GC.c @@ -1,5 +1,5 @@ /* $XConsortium: GC.c /main/8 1996/12/02 10:21:19 lehors $ */ -/* $XFree86: xc/programs/Xserver/hw/xnest/GC.c,v 3.3 1996/12/23 07:09:13 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/GC.c,v 3.4 1999/09/25 14:38:20 dawes Exp $ */ /* Copyright 1993 by Davor Matic @@ -280,9 +280,8 @@ void xnestChangeClip(pGC, type, pValue, nRects) * other parts of server can only deal with CT_NONE, * CT_PIXMAP and CT_REGION client clips. */ - pGC->clientClip = (pointer) (*pGC->pScreen->RectsToRegion)(nRects, - (xRectangle *)pValue, - type); + pGC->clientClip = (pointer) RECTS_TO_REGION(pGC->pScreen, nRects, + (xRectangle *)pValue, type); xfree(pValue); pValue = pGC->clientClip; type = CT_REGION; diff --git a/xc/programs/Xserver/hw/xnest/Imakefile b/xc/programs/Xserver/hw/xnest/Imakefile index 6820123af..e83b42588 100644 --- a/xc/programs/Xserver/hw/xnest/Imakefile +++ b/xc/programs/Xserver/hw/xnest/Imakefile @@ -1,5 +1,5 @@ XCOMM $TOG: Imakefile /main/12 1997/11/03 14:13:20 kaleb $ -XCOMM $XFree86: xc/programs/Xserver/hw/xnest/Imakefile,v 3.13 1999/06/14 07:32:10 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/xnest/Imakefile,v 3.14 1999/09/25 14:38:20 dawes Exp $ #include <Server.tmpl> #ifdef OS2Architecture @@ -50,16 +50,12 @@ OBJS = Args.o \ miinitext.o $(OBJS1) -INCLUDES = -I$(BUILDINCDIR) -I$(FONTINCSRC) \ +INCLUDES = -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \ -I../../mi -I../../include -I../../os \ - -I$(EXTINCSRC) -I$(INCLUDESRC) -I. + -I$(EXTINCSRC) -I$(XINCLUDESRC) all:: $(OBJS) -INCLUDES = -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \ - -I../../mi -I../../include -I../../os \ - -I$(EXTINCSRC) -I$(XINCLUDESRC) - LinkSourceFile(stubs.c,$(SERVERSRC)/Xi) SpecialCObjectRule(Init,$(ICONFIGFILES),$(EXT_DEFINES)) LinkSourceFile(miinitext.c,$(SERVERSRC)/mi) |