diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-11 12:14:52 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-11 12:14:52 +0000 |
| commit | 4c61bf84b11e26e6f22648668c95ea760a379163 (patch) | |
| tree | 0ac762ab2815eae283dded7447ad7cb5a54b926a /xorg-server/hw/xfree86/vgahw | |
| parent | e1dabd2ce8be0d70c6c15353b58de256129dfd1f (diff) | |
| download | vcxsrv-4c61bf84b11e26e6f22648668c95ea760a379163.tar.gz vcxsrv-4c61bf84b11e26e6f22648668c95ea760a379163.tar.bz2 vcxsrv-4c61bf84b11e26e6f22648668c95ea760a379163.zip | |
xserver git update 11/6/2010
Diffstat (limited to 'xorg-server/hw/xfree86/vgahw')
| -rw-r--r-- | xorg-server/hw/xfree86/vgahw/vgaCmap.c | 4 | ||||
| -rw-r--r-- | xorg-server/hw/xfree86/vgahw/vgaHW.c | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/xorg-server/hw/xfree86/vgahw/vgaCmap.c b/xorg-server/hw/xfree86/vgahw/vgaCmap.c index e337b42c0..a65bb5e86 100644 --- a/xorg-server/hw/xfree86/vgahw/vgaCmap.c +++ b/xorg-server/hw/xfree86/vgahw/vgaCmap.c @@ -51,7 +51,7 @@ vgaListInstalledColormaps(pScreen, pmaps) * is always a colormap installed */
*pmaps = GetInstalledmiColormap(pScreen)->mid;
- return(1);
+ return 1;
}
int
@@ -63,7 +63,7 @@ vgaGetInstalledColormaps(pScreen, pmaps) * is always a colormap installed */
*pmaps = GetInstalledmiColormap(pScreen);
- return(1);
+ return 1;
}
int vgaCheckColorMap(ColormapPtr pmap)
diff --git a/xorg-server/hw/xfree86/vgahw/vgaHW.c b/xorg-server/hw/xfree86/vgahw/vgaHW.c index 396a3cc62..7b1c95e62 100644 --- a/xorg-server/hw/xfree86/vgahw/vgaHW.c +++ b/xorg-server/hw/xfree86/vgahw/vgaHW.c @@ -658,7 +658,7 @@ vgaHWSaveScreen(ScreenPtr pScreen, int mode) if ((pScrn != NULL) && pScrn->vtSema) {
vgaHWBlankScreen(pScrn, on);
}
- return (TRUE);
+ return TRUE;
}
@@ -1351,7 +1351,7 @@ vgaHWInit(ScrnInfoPtr scrninfp, DisplayModePtr mode) regp->Attribute[19] = 0x00;
regp->Attribute[20] = 0x00;
- return(TRUE);
+ return TRUE;
}
/*
@@ -1479,8 +1479,7 @@ vgaHWGetHWRecPrivate(void) static void
vgaHWFreeRegs(vgaRegPtr regp)
{
- if (regp->CRTC)
- free(regp->CRTC);
+ free(regp->CRTC);
regp->CRTC =
regp->Sequencer =
|