andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
James Jones 2010-12-06 13:36:14 -08:00
parent 311cad3315
commit 27593eea7e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Xext/sync.c
View File

@ -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)

4
include/protocol-versions.h
View File

@ -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