libX11: Changes to 'master'

[Daniel Stone]

 src/KeysymStr.c      |    3 +--
 src/Xresinternal.h   |    4 +++-
 src/util/Makefile.am |    3 +++
 src/util/makekeys.c  |    5 +++--
 4 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 24283d40b1e4314c6647dda49d2a159833341a8b
Author: Derek Buitenhuis <derek.buitenhuis at gmail.com>
Date:   Thu Sep 22 18:44:13 2011 -0400

    makekeys: Fix build/target word size mismatch when cross-compiling
    
    Since makekeys is built using build environment's gcc and
    runs natively, we have to make sure that the size of the
    Signature type is the same on both the native environment
    and the target, otherwise we get mismatches upon running X,
    and some LSB test failures (xts5).
    
    Use an unsigned 32-bit integer on all platforms. Also,
    eliminate the redundant multiple typedefs for the
    Signature type.
    
    Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>