presentproto: Changes to 'master'

[Adam Jackson]

 presentproto.h |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 8405ee4552565825d776e6a8963d33d9cd9cddf0
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Dec 11 13:25:06 2013 -0500

    Force Window and Pixmap to be CARD32 on the wire
    
    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.
    
    Reviewed-by: Jasper St. Pierre <jstpierre at mecheye.net>
    Signed-off-by: Adam Jackson <ajax at redhat.com>