diff options
author | marha <marha@users.sourceforge.net> | 2011-04-01 12:04:34 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-04-01 12:04:34 +0000 |
commit | 0fd309bfed8f9f61a8ea8bbbe7628d0af471c070 (patch) | |
tree | 97a335ffb903e9cf159322f3906f9cb71d660d9c /xorg-server/fb/fbarc.c | |
parent | dab40e0df33e80dab53b4ca20760c1fb4388649b (diff) | |
parent | 5d8e1ad0cd01de0bd0b43dc916c1d39fd293e79d (diff) | |
download | vcxsrv-0fd309bfed8f9f61a8ea8bbbe7628d0af471c070.tar.gz vcxsrv-0fd309bfed8f9f61a8ea8bbbe7628d0af471c070.tar.bz2 vcxsrv-0fd309bfed8f9f61a8ea8bbbe7628d0af471c070.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/fb/fbarc.c')
-rw-r--r-- | xorg-server/fb/fbarc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/xorg-server/fb/fbarc.c b/xorg-server/fb/fbarc.c index 1da980255..07fb70c4e 100644 --- a/xorg-server/fb/fbarc.c +++ b/xorg-server/fb/fbarc.c @@ -47,7 +47,6 @@ fbPolyArc (DrawablePtr pDrawable, if (pGC->lineWidth == 0)
{
-#ifndef FBNOPIXADDR
arc = 0;
if (pGC->lineStyle == LineSolid && pGC->fillStyle == FillSolid)
{
@@ -55,9 +54,7 @@ fbPolyArc (DrawablePtr pDrawable, {
case 8: arc = fbArc8; break;
case 16: arc = fbArc16; break;
-#ifdef FB_24BIT
case 24: arc = fbArc24; break;
-#endif
case 32: arc = fbArc32; break;
}
}
@@ -141,7 +138,6 @@ fbPolyArc (DrawablePtr pDrawable, #endif
}
else
-#endif
miZeroPolyArc (pDrawable, pGC, narcs, parcs);
}
else
|