diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-21 08:08:22 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-21 08:08:22 +0100 |
| commit | a8a12d4c8be177f63cae7dc96c2b52f09e228a76 (patch) | |
| tree | 72ea4c93cc3337810a32ccc0fb34b3bd96d933e9 /xorg-server/hw/xfree86/os-support | |
| parent | e3710c8691dceaccf51bb80e5a1f7d1830758f7e (diff) | |
| parent | 45710577f374972946a8eb37833a9c94e5a299bf (diff) | |
| download | vcxsrv-a8a12d4c8be177f63cae7dc96c2b52f09e228a76.tar.gz vcxsrv-a8a12d4c8be177f63cae7dc96c2b52f09e228a76.tar.bz2 vcxsrv-a8a12d4c8be177f63cae7dc96c2b52f09e228a76.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/hw/xfree86/os-support')
| -rw-r--r-- | xorg-server/hw/xfree86/os-support/bus/Pci.h | 1 | ||||
| -rw-r--r-- | xorg-server/hw/xfree86/os-support/linux/lnx_video.c | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/xorg-server/hw/xfree86/os-support/bus/Pci.h b/xorg-server/hw/xfree86/os-support/bus/Pci.h index 88560ecdc..5709bd841 100644 --- a/xorg-server/hw/xfree86/os-support/bus/Pci.h +++ b/xorg-server/hw/xfree86/os-support/bus/Pci.h @@ -108,7 +108,6 @@ #define _PCI_H 1 #include "xf86Pci.h" -#include "xf86PciInfo.h" /* * Global Definitions 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 e711784e7..0d91f7a52 100644 --- a/xorg-server/hw/xfree86/os-support/linux/lnx_video.c +++ b/xorg-server/hw/xfree86/os-support/linux/lnx_video.c @@ -465,11 +465,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)); + uintptr_t alignOff = (uintptr_t)Base + - ((uintptr_t)Base & ~(getpagesize() - 1)); - DebugF("alignment offset: %lx\n",alignOff); - munmap((caddr_t)((memType)Base - alignOff), (Size + alignOff)); + DebugF("alignment offset: %lx\n", (unsigned long)alignOff); + munmap((void *)((uintptr_t)Base - alignOff), (Size + alignOff)); } |