diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:06 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:06 +0000 |
| commit | 27b6ad3b9d7a4c99cb52baa78eb38a69323d3d89 (patch) | |
| tree | 8410f19745d986bbf886dc50aeb348f4fdff3f36 | |
| parent | bcc73836f26e72980368ff88ea7fb2f191b6a3c1 (diff) | |
Pull XORG-6_8_0 to CYGWIN branchYGWIN-6_8_1-MERGECYGWIN-6_8_2-MERGECYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGECYGWIN
| -rw-r--r-- | README.sgml | 1 | ||||
| -rw-r--r-- | src/tga_driver.c | 4 | ||||
| -rw-r--r-- | src/tga_line.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/README.sgml b/README.sgml index 091aa5f..c04cbf4 100644 --- a/README.sgml +++ b/README.sgml @@ -9,7 +9,6 @@ <date>March 25th, 2004 <ident> -$Id$ </ident> <toc> diff --git a/src/tga_driver.c b/src/tga_driver.c index 7c49375..6926eb2 100644 --- a/src/tga_driver.c +++ b/src/tga_driver.c @@ -189,7 +189,7 @@ static const char *ramdacSymbols[] = { static const char *xaaSymbols[] = { "XAACreateInfoRec", "XAADestroyInfoRec", - "XAAGCIndex", + "XAAGetGCIndex", "XAAInit", NULL }; @@ -210,7 +210,7 @@ static XF86ModuleVersionInfo tgaVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, TGA_MAJOR_VERSION, TGA_MINOR_VERSION, TGA_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, diff --git a/src/tga_line.c b/src/tga_line.c index 3d1696d..49c62fe 100644 --- a/src/tga_line.c +++ b/src/tga_line.c @@ -413,7 +413,7 @@ TGAPolySegment( #endif ){ XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC); - XAAGCPtr pGCPriv = (XAAGCPtr) (pGC)->devPrivates[XAAGCIndex].ptr; + XAAGCPtr pGCPriv = (XAAGCPtr) (pGC)->devPrivates[XAAGetGCIndex()].ptr; BoxPtr pboxInit = REGION_RECTS(pGC->pCompositeClip); int nboxInit = REGION_NUM_RECTS(pGC->pCompositeClip); unsigned int bias = miGetZeroLineBias(pDrawable->pScreen); |