x11proto: Changes to 'master'

[Jon TURNEY]

 Xpoll.h.in |    2 +-
 Xwindows.h |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit d522ff998b77f0c8c39c4d3945f78d2221fe1209
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Tue Dec 17 14:26:07 2013 +0000

    Xpoll.h.in: Fix WIN32 check to trigger on MinGW only
    
    MinGW-w64 w32api-headers 3.0.0 define WIN32 in some places they didn't before,
    which causes this check to turn on for Cygwin, which is not wanted.
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
    Reviewed-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>

commit aee7e4de57349db186ca9d8c1312dc18590d3942
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date:   Wed Apr 3 13:55:16 2013 +0100

    Xwindows.h: Wrap Windows 64-bit types as well for 64-bit build
    
    Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
    Reviewed-by: Jon TURNEY <jon.turney at dronecode.org.uk>