summaryrefslogtreecommitdiff
path: root/src/savage_driver.c
diff options
context:
space:
mode:
authorAlex Deucher <agd5f@yahoo.com>2004-09-30 05:31:13 +0000
committerAlex Deucher <agd5f@yahoo.com>2004-09-30 05:31:13 +0000
commitd88b1abf40905ff9b343b047c34460162017ddfc (patch)
tree9a68096b8548d01b6d8e2f8f6acdd33ecf70feb8 /src/savage_driver.c
parenta1ef17bb2cc069511baaefcbe04298c087533d35 (diff)
Portability fixes from Matthieu Herrb (bug 1409)
Diffstat (limited to 'src/savage_driver.c')
-rw-r--r--src/savage_driver.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/savage_driver.c b/src/savage_driver.c
index 6049d81..c7ff0a2 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -1335,12 +1335,13 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
}
psav->EntityIndex = pEnt->index;
-
+
+#ifdef XFree86LOADER
if (xf86LoadSubModule(pScrn, "vbe")) {
xf86LoaderReqSymLists(vbeSymbols, NULL);
psav->pVbe = VBEInit(NULL, pEnt->index);
}
-
+#endif
psav->PciInfo = xf86GetPciInfoForEntity(pEnt->index);
xf86RegisterResources(pEnt->index, NULL, ResNone);
@@ -4074,7 +4075,7 @@ SavageDDC1(int scrnIndex)
{
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
SavagePtr psav = SAVPTR(pScrn);
- uchar byte;
+ unsigned char byte;
xf86MonPtr pMon;
UnLockExtRegs();
@@ -4136,8 +4137,8 @@ static void
SavageResetStreams(ScrnInfoPtr pScrn)
{
SavagePtr psav = SAVPTR(pScrn);
- uchar cr67;
- uchar cr69;
+ unsigned char cr67;
+ unsigned char cr69;
/* disable streams */
switch (psav->Chipset) {