diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-01 17:03:50 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-01 17:03:50 +0200 |
| commit | aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa (patch) | |
| tree | 37bc7921f864ead4f6eb357b31a1eb66d46aaef9 /xorg-server/hw/xfree86/int10/stub.c | |
| parent | 2e0adb33e03e3142f1412ed570415c5ce616dcef (diff) | |
| parent | ea0cd87ecbe9fc3c5503ccad7f87a895a458d6d4 (diff) | |
| download | vcxsrv-aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa.tar.gz vcxsrv-aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa.tar.bz2 vcxsrv-aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libxcb/src/xcb_util.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
xorg-server/os/utils.c
Diffstat (limited to 'xorg-server/hw/xfree86/int10/stub.c')
| -rw-r--r-- | xorg-server/hw/xfree86/int10/stub.c | 2 |
1 files changed, 1 insertions, 1 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; } |