diff options
author | marha <marha@users.sourceforge.net> | 2014-05-01 16:56:41 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-05-01 16:56:41 +0200 |
commit | ea0cd87ecbe9fc3c5503ccad7f87a895a458d6d4 (patch) | |
tree | a961f21249024edee920dc41bb54b2507cf08696 /xorg-server/hw/xfree86/int10 | |
parent | 03418d6378fe72bea2ff4b941792054dd208b65d (diff) | |
download | vcxsrv-ea0cd87ecbe9fc3c5503ccad7f87a895a458d6d4.tar.gz vcxsrv-ea0cd87ecbe9fc3c5503ccad7f87a895a458d6d4.tar.bz2 vcxsrv-ea0cd87ecbe9fc3c5503ccad7f87a895a458d6d4.zip |
xkeyboard-config libxcb xserver mesa git update 1 May 2014
xserver commit 2535b76c0d32bc1dd0ddaca06a419a68a4757df1
libxcb commit d978a4f69b30b630f28d07f1003cf290284d24d8
xkeyboard-config commit 5274a69ee85fb6c425c33c631fa8ea1310a8f097
mesa commit a773fdc64da8ba88d8c7f8e383c45248b0c3aa19
Diffstat (limited to 'xorg-server/hw/xfree86/int10')
-rw-r--r-- | xorg-server/hw/xfree86/int10/stub.c | 2 | ||||
-rw-r--r-- | xorg-server/hw/xfree86/int10/xf86x86emu.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/int10/stub.c b/xorg-server/hw/xfree86/int10/stub.c index 40e0ba719..4bbcddeda 100644 --- a/xorg-server/hw/xfree86/int10/stub.c +++ b/xorg-server/hw/xfree86/int10/stub.c @@ -63,7 +63,7 @@ xf86ExecX86int10(xf86Int10InfoPtr pInt) } void * -xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr) +xf86int10Addr(xf86Int10InfoPtr pInt, uint32_t addr) { return 0; } diff --git a/xorg-server/hw/xfree86/int10/xf86x86emu.c b/xorg-server/hw/xfree86/int10/xf86x86emu.c index b9a4d3603..4b0a13090 100644 --- a/xorg-server/hw/xfree86/int10/xf86x86emu.c +++ b/xorg-server/hw/xfree86/int10/xf86x86emu.c @@ -9,7 +9,6 @@ #include <x86emu.h> #include "xf86.h" -#include "compiler.h" #include "xf86_OSproc.h" #include "xf86Pci.h" #define _INT10_PRIVATE |