diff options
Diffstat (limited to 'xorg-server/hw/xfree86/vgahw')
| -rw-r--r-- | xorg-server/hw/xfree86/vgahw/vgaCmap.c | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xfree86/vgahw/vgaHW.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/hw/xfree86/vgahw/vgaCmap.c b/xorg-server/hw/xfree86/vgahw/vgaCmap.c index e7a0d023e..6e028a7f5 100644 --- a/xorg-server/hw/xfree86/vgahw/vgaCmap.c +++ b/xorg-server/hw/xfree86/vgahw/vgaCmap.c @@ -252,7 +252,7 @@ ColormapPtr pmap; if (pmap != GetInstalledmiColormap(pmap->pScreen)) return; - dixLookupResourceByType((pointer *) &defColormap, + dixLookupResourceByType((void **) &defColormap, pmap->pScreen->defColormap, RT_COLORMAP, serverClient, DixInstallAccess); diff --git a/xorg-server/hw/xfree86/vgahw/vgaHW.h b/xorg-server/hw/xfree86/vgahw/vgaHW.h index 937a8a507..63a10f42b 100644 --- a/xorg-server/hw/xfree86/vgahw/vgaHW.h +++ b/xorg-server/hw/xfree86/vgahw/vgaHW.h @@ -107,18 +107,18 @@ typedef void (*vgaHWMiscProcPtr) (vgaHWPtr hwp); * via the first 17 attribute registers and not the main 8-bit palette. */ typedef struct _vgaHWRec { - pointer Base; /* Address of "VGA" memory */ + void *Base; /* Address of "VGA" memory */ int MapSize; /* Size of "VGA" memory */ unsigned long MapPhys; /* phys location of VGA mem */ int IOBase; /* I/O Base address */ CARD8 *MMIOBase; /* Pointer to MMIO start */ int MMIOOffset; /* base + offset + vgareg = mmioreg */ - pointer FontInfo1; /* save area for fonts in + void *FontInfo1; /* save area for fonts in plane 2 */ - pointer FontInfo2; /* save area for fonts in + void *FontInfo2; /* save area for fonts in plane 3 */ - pointer TextInfo; /* save area for text */ + void *TextInfo; /* save area for text */ vgaRegRec SavedReg; /* saved registers */ vgaRegRec ModeReg; /* register settings for current mode */ @@ -148,7 +148,7 @@ typedef struct _vgaHWRec { vgaHWWriteProcPtr writeDacReadAddr; vgaHWWriteProcPtr writeDacData; vgaHWReadProcPtr readDacData; - pointer ddc; + void *ddc; struct pci_io_handle *io; vgaHWReadProcPtr readEnable; vgaHWWriteProcPtr writeEnable; |