summaryrefslogtreecommitdiff
path: root/xserver/Xext/xcalibrate.c
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2010-07-27 19:02:39 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2010-07-27 19:02:39 +0000
commit269d40cbcc43b41f621ca6d91c182952f60ec48e (patch)
tree872f2fddd3f2207e57a28595e73886713ce4a77a /xserver/Xext/xcalibrate.c
parent917a2249b787451cad3f9697872aeccfd0da3324 (diff)
Update to xserver 1.8. Tested by many. Ok oga@, todd@.
Diffstat (limited to 'xserver/Xext/xcalibrate.c')
-rw-r--r--xserver/Xext/xcalibrate.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/xserver/Xext/xcalibrate.c b/xserver/Xext/xcalibrate.c
index 3e05e6ca2..6e6461a5f 100644
--- a/xserver/Xext/xcalibrate.c
+++ b/xserver/Xext/xcalibrate.c
@@ -24,8 +24,6 @@
#include <kdrive-config.h>
#endif
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/X.h>
#include <X11/Xproto.h>
@@ -34,6 +32,7 @@
#include "dixstruct.h"
#include "extnsionst.h"
#include "swaprep.h"
+#include "protocol-versions.h"
#include <X11/extensions/xcalibrateproto.h>
#include <X11/extensions/xcalibratewire.h>
@@ -81,8 +80,8 @@ ProcXCalibrateQueryVersion (ClientPtr client)
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
- rep.majorVersion = XCALIBRATE_MAJOR_VERSION;
- rep.minorVersion = XCALIBRATE_MINOR_VERSION;
+ rep.majorVersion = SERVER_XCALIBRATE_MAJOR_VERSION;
+ rep.minorVersion = SERVER_XCALIBRATE_MINOR_VERSION;
if (client->swapped) {
int n;
swaps(&rep.sequenceNumber, n);