fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 12:50:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add and use SERVER_SYNC_*_VERSION

Browse source 
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:
James Jones 2010-12-06 13:36:14 -08:00 • committed by Jeremy Huddleston
parent 30fe77d923
commit 20045592cd
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 "opaque.h"
#include <X11/extensions/syncproto.h> #include <X11/extensions/syncproto.h>
#include "syncsrv.h" #include "syncsrv.h"
#include "protocol-versions.h"
#include <stdio.h> #include <stdio.h>
#if !defined(WIN32) #if !defined(WIN32)
@ -1137,8 +1138,8 @@ ProcSyncInitialize(ClientPtr client)
memset(&rep, 0, sizeof(xSyncInitializeReply)); memset(&rep, 0, sizeof(xSyncInitializeReply));
rep.type = X_Reply; rep.type = X_Reply;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;
rep.majorVersion = SYNC_MAJOR_VERSION; rep.majorVersion = SERVER_SYNC_MAJOR_VERSION;
rep.minorVersion = SYNC_MINOR_VERSION; rep.minorVersion = SERVER_SYNC_MINOR_VERSION;
rep.length = 0; rep.length = 0;
if (client->swapped) if (client->swapped)

4
include/protocol-versions.h
View file

@ -95,6 +95,10 @@
#define SERVER_SHM_MAJOR_VERSION 1 #define SERVER_SHM_MAJOR_VERSION 1
#define SERVER_SHM_MINOR_VERSION 1 #define SERVER_SHM_MINOR_VERSION 1
/* Sync */
#define SERVER_SYNC_MAJOR_VERSION 3
#define SERVER_SYNC_MINOR_VERSION 0
/* Windows WM */ /* Windows WM */
#define SERVER_WINDOWSWM_MAJOR_VERSION 1 #define SERVER_WINDOWSWM_MAJOR_VERSION 1
#define SERVER_WINDOWSWM_MINOR_VERSION 0 #define SERVER_WINDOWSWM_MINOR_VERSION 0