diff options
| author | James Jones <jajones@nvidia.com> | 2010-12-06 13:36:14 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-01-11 11:14:42 -0800 |
| commit | 20045592cd5c9bf10659d6eeffefd48b8fe0885b (patch) | |
| tree | 17bd5d27415416be63f2664a2ebfc7dace190c35 | |
| parent | 30fe77d923dda00744df6f460ca34642335b8530 (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>
(cherry picked from commit 27593eea7efcbed8de0c6e8233cbd1a1b8a50459)
| -rw-r--r-- | Xext/sync.c | 5 | ||||
| -rw-r--r-- | include/protocol-versions.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Xext/sync.c b/Xext/sync.c index 2015fc136..4e73b8004 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) @@ -1137,8 +1138,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) diff --git a/include/protocol-versions.h b/include/protocol-versions.h index 97ef5dad5..910791562 100644 --- a/include/protocol-versions.h +++ b/include/protocol-versions.h @@ -95,6 +95,10 @@ #define SERVER_SHM_MAJOR_VERSION 1 #define SERVER_SHM_MINOR_VERSION 1 +/* Sync */ +#define SERVER_SYNC_MAJOR_VERSION 3 +#define SERVER_SYNC_MINOR_VERSION 0 + /* Windows WM */ #define SERVER_WINDOWSWM_MAJOR_VERSION 1 #define SERVER_WINDOWSWM_MINOR_VERSION 0 |