diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:25 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:25 +0000 |
| commit | b898bcbd0a540b64d73c9fd4db2069ed6a00360f (patch) | |
| tree | bfc99c3d4bdcc4ef6bb59fcca5294ef1f49e1fec /src/mga_arc.c | |
| parent | 03f00bf8411e6c36d3aef1907e42a52854353101 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
Diffstat (limited to 'src/mga_arc.c')
| -rw-r--r-- | src/mga_arc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mga_arc.c b/src/mga_arc.c index 5c9a9cb..d282967 100644 --- a/src/mga_arc.c +++ b/src/mga_arc.c @@ -23,7 +23,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_arc.c,v 1.12 2003/07/16 03:08:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_arc.c,v 1.12tsi Exp $ */ #include "X.h" @@ -70,7 +70,8 @@ MGAZeroArc( ){ int yoffset, dyoffset, x, y, a, b, d, mask, k1, k3, dx, dy, tmp; XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC); - MGAPtr pMga = MGAPTR(infoRec->pScrn); + ScrnInfoPtr pScrn = infoRec->pScrn; + MGAPtr pMga = MGAPTR(pScrn); miZeroArcRec info; Bool do360; DDXPointRec org, orgo; |