libICE: Changes to 'master'

[Alan Coopersmith]

 include/X11/ICE/ICElib.h |    4 ++--
 src/icetrans.c           |    6 +++---
 src/register.c           |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit a99fbad09ab850e65ddd57e4d4488e4726295e14
Author: Peter Breitenlohner <peb at mppmu.mpg.de>
Date:   Tue Oct 7 13:21:48 2008 -0700

    Constify some arguments in libICE to clear warnings in libSM
    
    This patch avoids the gcc (3.4.6) warnings:
     ../../libSM-1.0.3/src/sm_client.c:104: warning: passing arg 7 of `IceRegisterForProtocolSetup' from incompatible pointer type
     ../../libSM-1.0.3/src/sm_manager.c:168: warning: passing arg 7 of `IceRegisterForProtocolReply' from incompatible pointer type
    when compiling libSM

commit 3bceaeb3192ca75a14854d614e1621d28fb82274
Author: Peter Breitenlohner <peb at mppmu.mpg.de>
Date:   Tue Oct 7 11:25:42 2008 -0700

    define macros to 1 in icetrans.c to avoid redefined macro warnings
    
    X.Org Bug #17947 <http://bugs.freedesktop.org/show_bug.cgi?id=17947>
    Patch #19444 <http://bugs.freedesktop.org/attachment.cgi?id=19444>
    
    Define as 1 (one) as done by autoconf and the command line
    option, e.g. -DICE_t, not as empty.
    
    This avoids the gcc (3.4.6) warnings:
     ../../libICE-1.0.4/src/icetrans.c:29:1: warning: "ICE_t" redefined
     ../config.h:38:1: warning: this is the location of the previous definition
     ../../libICE-1.0.4/src/icetrans.c:30:1: warning: "TRANS_CLIENT" redefined
     <command line>:6:1: warning: this is the location of the previous definition
     ../../libICE-1.0.4/src/icetrans.c:31:1: warning: "TRANS_SERVER" redefined
     <command line>:7:1: warning: this is the location of the previous definition