libX11: Changes to 'master'

[Yaakov Selkowitz]

 modules/im/ximcp/imCallbk.c  |   54 +++++-----
 modules/im/ximcp/imDefFlt.c  |   40 +++----
 modules/im/ximcp/imDefIc.c   |   60 +++++------
 modules/im/ximcp/imDefIm.c   |   96 +++++++++---------
 modules/im/ximcp/imDefLkup.c |   74 +++++++-------
 modules/im/ximcp/imDispch.c  |    8 -
 modules/im/ximcp/imExten.c   |   34 +++---
 modules/im/ximcp/imImSw.c    |    2 
 modules/im/ximcp/imInsClbk.c |   14 +-
 modules/im/ximcp/imInt.c     |   20 +--
 modules/im/ximcp/imLcGIc.c   |    2 
 modules/im/ximcp/imLcIc.c    |   16 +--
 modules/im/ximcp/imLcIm.c    |   34 +++---
 modules/im/ximcp/imLcLkup.c  |   14 +-
 modules/im/ximcp/imLcSIc.c   |    2 
 modules/im/ximcp/imRm.c      |  220 +++++++++++++++++++++----------------------
 modules/im/ximcp/imRmAttr.c  |   48 ++++-----
 modules/im/ximcp/imThaiFlt.c |   98 +++++++++----------
 modules/im/ximcp/imThaiIc.c  |   14 +-
 modules/im/ximcp/imThaiIm.c  |    8 -
 modules/im/ximcp/imTrX.c     |   28 ++---
 modules/im/ximcp/imTrans.c   |   22 ++--
 modules/im/ximcp/imTransR.c  |   22 ++--
 src/xlibi18n/Ximint.h        |    7 -
 24 files changed, 467 insertions(+), 470 deletions(-)

New commits:
commit d14b6a250f004fa405179db7020f6953001d17b9
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date:   Mon Oct 22 13:54:11 2012 -0500

    XIM: remove Private and Public macros
    
    Private is a struct member name in mingw-w64 <winioctl.h>, causing this
    useless define in a private header to break the build.
    
    Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
    Reviewed-by: Jon TURNEY <jon.turney at dronecode.org.uk>