[PATCH] Define server-supported protocol versions in one single file.

Julien Cristau jcristau at debian.org
Mon Sep 21 01:57:16 PDT 2009


On Sun, Sep 20, 2009 at 22:22:55 +1000, Peter Hutterer wrote:

> diff --git a/Xext/security.c b/Xext/security.c
> index 42eb9f0..b43e419 100644
> --- a/Xext/security.c
> +++ b/Xext/security.c
> @@ -371,8 +371,8 @@ ProcSecurityQueryVersion(
>      rep.type        	= X_Reply;
>      rep.sequenceNumber 	= client->sequence;
>      rep.length         	= 0;
> -    rep.majorVersion  	= SECURITY_MAJOR_VERSION;
> -    rep.minorVersion  	= SECURITY_MINOR_VERSION;
> +    rep.majorVersion  	= SERVER_SECURITY_MAJOR_VERSION;
> +    rep.minorVersion  	= SERVER_SECURITY_MINOR_VERSION;
>      if(client->swapped)
>      {
>  	char n;

Seems like the protocol-versions.h include is missing from this one?

[...]
> diff --git a/include/Makefile.am b/include/Makefile.am
> index f8eef53..057c2f2 100644
> --- a/include/Makefile.am
> +++ b/include/Makefile.am
> @@ -65,4 +65,5 @@ AM_CFLAGS = $(DIX_CFLAGS)
>  
>  EXTRA_DIST = 	\
>  	dix-config-apple-verbatim.h \
> -	eventconvert.h eventstr.h
> +	eventconvert.h eventstr.h \
> +        protocol-versions.h

weird whitespace here.

With that fixed,
Acked-by: Julien Cristau <jcristau at debian.org>

Cheers,
Julien


More information about the xorg-devel mailing list