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 <[email protected]> --- Xext/sync.c | 5 +++-- include/protocol-versions.h | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Xext/sync.c b/Xext/sync.c index f23df6c..4da06ac 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) diff --git a/include/protocol-versions.h b/include/protocol-versions.h index c674465..ce28797 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 -- 1.7.1 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
