diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:07 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:07 +0000 |
| commit | 0097b6fe2d1739e46e4e7726aaa481b6dc84870c (patch) | |
| tree | 5e279fda13b69a02c684338ee803defbda33ab08 /hw/xfree86/xf8_32bpp/cfbgcunder.c | |
| parent | c57959ad6a4c0f5329762f401fd7871ffb2ee90c (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'hw/xfree86/xf8_32bpp/cfbgcunder.c')
| -rw-r--r-- | hw/xfree86/xf8_32bpp/cfbgcunder.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/hw/xfree86/xf8_32bpp/cfbgcunder.c b/hw/xfree86/xf8_32bpp/cfbgcunder.c index d263b8b9e..d01b2b5cb 100644 --- a/hw/xfree86/xf8_32bpp/cfbgcunder.c +++ b/hw/xfree86/xf8_32bpp/cfbgcunder.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c,v 1.5 2001/12/14 19:59:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c,v 1.6 2003/07/16 01:38:50 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -66,6 +66,7 @@ SOFTWARE. #include "cfbmskbits.h" #include "cfb8bit.h" +#include "cfb8_32.h" #ifdef WriteBitGroup # define useTEGlyphBlt cfbImageGlyphBlt8 @@ -217,9 +218,9 @@ static GCOps cfbNonTEOps = { }; static GCOps * -cfb32MatchCommon_Underlay (pGC, devPriv) - GCPtr pGC; - cfbPrivGCPtr devPriv; +cfb32MatchCommon_Underlay( + GCPtr pGC, + cfbPrivGCPtr devPriv) { if (pGC->lineWidth != 0) return 0; |