diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-03-19 09:42:56 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-03-19 09:42:56 +1030 |
| commit | 015d728bcde5b16a72a976579755421e3023626b (patch) | |
| tree | a77516504f14c8b20f844727f1cb2d4dcb87e757 /randr | |
| parent | 65b0eb60b0b9e6405aa2e3d4c712ec4d2f0da070 (diff) | |
| parent | b167583fe234a536aa6187e17f21da85be4f0b7f (diff) | |
Merge branch 'master' into mpx
Conflicts:
dix/devices.c
dix/events.c
mi/misprite.c
Diffstat (limited to 'randr')
| -rw-r--r-- | randr/rrcrtc.c | 2 | ||||
| -rw-r--r-- | randr/rrdispatch.c | 7 | ||||
| -rw-r--r-- | randr/rroutput.c | 2 | ||||
| -rw-r--r-- | randr/rrpointer.c | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c index 1f7462f28..db506f4b0 100644 --- a/randr/rrcrtc.c +++ b/randr/rrcrtc.c @@ -490,7 +490,7 @@ RRCrtcInit (void) int ProcRRGetCrtcInfo (ClientPtr client) { - REQUEST(xRRGetCrtcInfoReq);; + REQUEST(xRRGetCrtcInfoReq); xRRGetCrtcInfoReply rep; RRCrtcPtr crtc; CARD8 *extra; diff --git a/randr/rrdispatch.c b/randr/rrdispatch.c index 7f98965a4..5525427f6 100644 --- a/randr/rrdispatch.c +++ b/randr/rrdispatch.c @@ -22,6 +22,9 @@ #include "randrstr.h" +#define SERVER_RANDR_MAJOR 1 +#define SERVER_RANDR_MINOR 2 + Bool RRClientKnowsRates (ClientPtr pClient) { @@ -49,8 +52,8 @@ ProcRRQueryVersion (ClientPtr client) * Report the current version; the current * spec says they're all compatible after 1.0 */ - rep.majorVersion = RANDR_MAJOR; - rep.minorVersion = RANDR_MINOR; + rep.majorVersion = SERVER_RANDR_MAJOR; + rep.minorVersion = SERVER_RANDR_MINOR; if (client->swapped) { swaps(&rep.sequenceNumber, n); swapl(&rep.length, n); diff --git a/randr/rroutput.c b/randr/rroutput.c index a66433015..df1741f5c 100644 --- a/randr/rroutput.c +++ b/randr/rroutput.c @@ -366,7 +366,7 @@ RROutputInit (void) int ProcRRGetOutputInfo (ClientPtr client) { - REQUEST(xRRGetOutputInfoReq);; + REQUEST(xRRGetOutputInfoReq); xRRGetOutputInfoReply rep; RROutputPtr output; CARD8 *extra; diff --git a/randr/rrpointer.c b/randr/rrpointer.c index bf9031543..fec5d45bf 100644 --- a/randr/rrpointer.c +++ b/randr/rrpointer.c @@ -104,7 +104,7 @@ void RRPointerMoved (ScreenPtr pScreen, int x, int y) { rrScrPriv (pScreen); - RRCrtcPtr pointerCrtc = pScrPriv->pointerCrtc;; + RRCrtcPtr pointerCrtc = pScrPriv->pointerCrtc; int c; /* Check last known CRTC */ |