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 27593eea7e
)
This commit is contained in:
parent
472163b7f3
commit
c038d008e4
|
@ -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)
|
||||
|
@ -1140,8 +1141,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)
|
||||
|
|
|
@ -99,6 +99,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
|
||||
|
|
Loading…
Reference in New Issue