summaryrefslogtreecommitdiff
path: root/randr
diff options
context:
space:
mode:
Diffstat (limited to 'randr')
-rw-r--r--randr/rrcrtc.c2
-rw-r--r--randr/rrdispatch.c7
-rw-r--r--randr/rroutput.c2
-rw-r--r--randr/rrpointer.c2
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 */