[PATCH] xfree86: Fix powerpc build with -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast
Jeremy Huddleston
jeremyhu at apple.com
Tue Nov 1 15:01:10 PDT 2011
memType is a uint64_t on powerpc
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
---
hw/xfree86/os-support/linux/lnx_video.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
index 3d45511..c12a654 100644
--- a/hw/xfree86/os-support/linux/lnx_video.c
+++ b/hw/xfree86/os-support/linux/lnx_video.c
@@ -469,11 +469,11 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
static void
unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
{
- memType alignOff = (memType)Base
- - ((memType)Base & ~(getpagesize() - 1));
+ memType alignOff = (memType)(uintptr_t)Base
+ - ((memType)(uintptr_t)Base & ~(getpagesize() - 1));
DebugF("alignment offset: %lx\n",alignOff);
- munmap((caddr_t)((memType)Base - alignOff), (Size + alignOff));
+ munmap((void *)(uintptr_t)((memType)(uintptr_t)Base - alignOff), (Size + alignOff));
}
--
1.7.7
More information about the xorg-devel
mailing list