summaryrefslogtreecommitdiff
path: root/Xext
diff options
context:
space:
mode:
authorJames Jones <jajones@nvidia.com>2010-12-06 13:36:14 -0800
committerJames Jones <jajones@nvidia.com>2010-12-06 19:07:00 -0800
commit27593eea7efcbed8de0c6e8233cbd1a1b8a50459 (patch)
treeec1ee3ffa8c1724fa4d260635f551d1628f31500 /Xext
parent311cad33155c64ed996418808727fc417168592e (diff)
Add and use SERVER_SYNC_*_VERSION
Most extensions have a version defined in the protocol headers, and also in the server's protocol-versions.h. The latter defines which version the server advertises support for. Sync wasn't included in protocol-versions.h, and was advertising support for whatever was in the protocol headers the server was built against. Signed-off-by: James Jones <jajones@nvidia.com> Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'Xext')
-rw-r--r--Xext/sync.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/Xext/sync.c b/Xext/sync.c
index f23df6cb9..4da06acd7 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -67,6 +67,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include "opaque.h"
#include <X11/extensions/syncproto.h>
#include "syncsrv.h"
+#include "protocol-versions.h"
#include <stdio.h>
#if !defined(WIN32)
@@ -1099,8 +1100,8 @@ ProcSyncInitialize(ClientPtr client)
memset(&rep, 0, sizeof(xSyncInitializeReply));
rep.type = X_Reply;
rep.sequenceNumber = client->sequence;
- rep.majorVersion = SYNC_MAJOR_VERSION;
- rep.minorVersion = SYNC_MINOR_VERSION;
+ rep.majorVersion = SERVER_SYNC_MAJOR_VERSION;
+ rep.minorVersion = SERVER_SYNC_MINOR_VERSION;
rep.length = 0;
if (client->swapped)