[PATCH presentproto] Force Window and Pixmap to be CARD32 on the wire

Jasper St. Pierre jstpierre at mecheye.net
Wed Dec 11 13:01:06 PST 2013


Reviewed-by: Jasper St. Pierre <jstpierre at mecheye.net>


On Wed, Dec 11, 2013 at 1:29 PM, Adam Jackson <ajax at redhat.com> wrote:

> If you don't do this then the client libs on 64-bit machines see them as
> XIDs, which are 64-bit wide (sigh), which ruins the wire encoding and
> nothing works.
>
> Signed-off-by: Adam Jackson <ajax at redhat.com>
> ---
>  presentproto.h | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/presentproto.h b/presentproto.h
> index 8303a94..ee65fa4 100644
> --- a/presentproto.h
> +++ b/presentproto.h
> @@ -25,6 +25,8 @@
>
>  #include <X11/extensions/presenttokens.h>
>
> +#define Window CARD32
> +#define Pixmap CARD32
>  #define Region CARD32
>  #define XSyncFence CARD32
>  #define EventID CARD32
> @@ -235,6 +237,8 @@ typedef struct {
>
>  #define sz_xPresentRedirectNotify 104
>
> +#undef Window
> +#undef Pixmap
>  #undef Region
>  #undef XSyncFence
>  #undef EventID
> --
> 1.8.4.2
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>



-- 
  Jasper
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20131211/79f89b91/attachment-0001.html>


More information about the xorg-devel mailing list