diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-30 20:51:05 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-30 20:51:05 +0000 |
| commit | 70a13fe295183aeea369adcb94f2d67e69fab387 (patch) | |
| tree | d707644ab424d0517a879b9784a543a899e1ae20 /xorg-server/hw/xfree86 | |
| parent | 9b51ee5bcf948185cfcba0600b3da2d241339174 (diff) | |
| parent | 140242b0d4aed1d595d6565d088d9567c456d6b4 (diff) | |
| download | vcxsrv-70a13fe295183aeea369adcb94f2d67e69fab387.tar.gz vcxsrv-70a13fe295183aeea369adcb94f2d67e69fab387.tar.bz2 vcxsrv-70a13fe295183aeea369adcb94f2d67e69fab387.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86')
| -rw-r--r-- | xorg-server/hw/xfree86/modes/xf86RandR12.c | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xfree86/parser/Pointer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86RandR12.c b/xorg-server/hw/xfree86/modes/xf86RandR12.c index 7880a41af..bd8421713 100644 --- a/xorg-server/hw/xfree86/modes/xf86RandR12.c +++ b/xorg-server/hw/xfree86/modes/xf86RandR12.c @@ -1755,6 +1755,7 @@ xf86RandR12EnterVT (int screen_index, int flags) XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
rrScrPrivPtr rp = rrGetScrPriv(pScreen);
Bool ret;
+ int i;
if (randrp->orig_EnterVT) {
pScrn->EnterVT = randrp->orig_EnterVT;
@@ -1766,7 +1767,6 @@ xf86RandR12EnterVT (int screen_index, int flags) }
/* reload gamma */
- int i;
for (i = 0; i < rp->numCrtcs; i++)
xf86RandR12CrtcSetGamma(pScreen, rp->crtcs[i]);
diff --git a/xorg-server/hw/xfree86/parser/Pointer.c b/xorg-server/hw/xfree86/parser/Pointer.c index 5e4db442e..a7ee3f213 100644 --- a/xorg-server/hw/xfree86/parser/Pointer.c +++ b/xorg-server/hw/xfree86/parser/Pointer.c @@ -189,7 +189,7 @@ xf86parsePointerSection (void) if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0) {
Error (ZAXISMAPPING_MSG, NULL);
}
- if (asprintf(&s, "%ul %ul", val1, val.num) == -1)
+ if (asprintf(&s, "%lu %u", val1, val.num) == -1)
s = NULL;
break;
case XAXIS:
|