aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/ramdac
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/hw/xfree86/ramdac')
-rw-r--r--xorg-server/hw/xfree86/ramdac/xf86CursorPriv.h2
-rw-r--r--xorg-server/hw/xfree86/ramdac/xf86HWCurs.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/xorg-server/hw/xfree86/ramdac/xf86CursorPriv.h b/xorg-server/hw/xfree86/ramdac/xf86CursorPriv.h
index 04be14135..a5d2aabc3 100644
--- a/xorg-server/hw/xfree86/ramdac/xf86CursorPriv.h
+++ b/xorg-server/hw/xfree86/ramdac/xf86CursorPriv.h
@@ -34,7 +34,7 @@ typedef struct {
int ForceHWCursorCount;
Bool HWCursorForced;
- pointer transparentData;
+ void *transparentData;
} xf86CursorScreenRec, *xf86CursorScreenPtr;
void xf86SetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y);
diff --git a/xorg-server/hw/xfree86/ramdac/xf86HWCurs.c b/xorg-server/hw/xfree86/ramdac/xf86HWCurs.c
index 197abff8f..3b69698db 100644
--- a/xorg-server/hw/xfree86/ramdac/xf86HWCurs.c
+++ b/xorg-server/hw/xfree86/ramdac/xf86HWCurs.c
@@ -462,9 +462,9 @@ RealizeCursorInterleave16(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
}
/* 16 bit interleave */
- DstS = (pointer) mem2;
+ DstS = (void *) mem2;
DstM = DstS + (size >> 2);
- pntr = (pointer) mem;
+ pntr = (void *) mem;
count = (size >> 1);
while (count) {
*pntr++ = *DstS++;
@@ -497,9 +497,9 @@ RealizeCursorInterleave32(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
}
/* 32 bit interleave */
- DstS = (pointer) mem2;
+ DstS = (void *) mem2;
DstM = DstS + (size >> 3);
- pntr = (pointer) mem;
+ pntr = (void *) mem;
count = (size >> 2);
while (count) {
*pntr++ = *DstS++;
@@ -532,9 +532,9 @@ RealizeCursorInterleave64(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
}
/* 64 bit interleave */
- DstS = (pointer) mem2;
+ DstS = (void *) mem2;
DstM = DstS + (size >> 3);
- pntr = (pointer) mem;
+ pntr = (void *) mem;
count = (size >> 2);
while (count) {
*pntr++ = *DstS++;