diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-08 21:42:21 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-08 21:42:21 +0000 |
| commit | ee97a3165b1f07f011cf95804590925b81e8ec96 (patch) | |
| tree | 58aa78664ad871145a5a0149f9ad60f140f934aa /xorg-server/hw/xfree86/os-support | |
| parent | c8a34ce9318446bcd8e91e601525a61d6847f28f (diff) | |
| parent | 432768f75da13ee5343957df6ce5cd316a62929f (diff) | |
| download | vcxsrv-ee97a3165b1f07f011cf95804590925b81e8ec96.tar.gz vcxsrv-ee97a3165b1f07f011cf95804590925b81e8ec96.tar.bz2 vcxsrv-ee97a3165b1f07f011cf95804590925b81e8ec96.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/os-support')
| -rw-r--r-- | xorg-server/hw/xfree86/os-support/linux/lnx_agp.c | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xfree86/os-support/linux/lnx_video.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_agp.c b/xorg-server/hw/xfree86/os-support/linux/lnx_agp.c index 705bb5ea0..dcc878060 100644 --- a/xorg-server/hw/xfree86/os-support/linux/lnx_agp.c +++ b/xorg-server/hw/xfree86/os-support/linux/lnx_agp.c @@ -264,7 +264,7 @@ xf86DeallocateGARTMemory(int screenNum, int key) }
#ifdef __linux__
- if (ioctl(gartFd, AGPIOC_DEALLOCATE, (int *)key) != 0) {
+ if (ioctl(gartFd, AGPIOC_DEALLOCATE, (int *)(uintptr_t)key) != 0) {
#else
if (ioctl(gartFd, AGPIOC_DEALLOCATE, &key) != 0) {
#endif
diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_video.c b/xorg-server/hw/xfree86/os-support/linux/lnx_video.c index 0311bdf15..697c9fe30 100644 --- a/xorg-server/hw/xfree86/os-support/linux/lnx_video.c +++ b/xorg-server/hw/xfree86/os-support/linux/lnx_video.c @@ -461,7 +461,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags) " (0x%08lx,0x%lx) (%s)\n", Base, Size,
strerror(errno));
}
- DebugF("base: %lx aligned base: %lx\n",base, base + alignOff);
+ DebugF("base: %lx aligned base: %lx\n",base, (char *)base + alignOff);
return (char *)base + alignOff;
}
#endif /* !(__sparc__) */
|