libX11: Changes to 'master'

[Alan Coopersmith]

 src/ImUtil.c      |    2 -
 src/OpenDis.c     |    4 +-
 src/XlibInt.c     |    2 -
 src/locking.c     |  107 +++++++++++++++++++-----------------------------------
 src/xkb/XKBBind.c |    2 -
 5 files changed, 43 insertions(+), 74 deletions(-)

New commits:
commit c8c41614911be4fa222fa22478677d263b41c751
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Mon Apr 6 16:52:46 2009 -0700

    Fix a several sparse warnings: Using plain integer as NULL pointer
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>

commit b336c3d0cc2aefc8926500cff5f76b5a3e803886
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Mon Apr 6 16:32:05 2009 -0700

    Further ansify prototypes & reduce #ifdefs in locking.c
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>