xrdb: Changes to 'master'

[Alan Coopersmith]

 man/xrdb.man |    4 ++++
 xrdb.c       |   12 +++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 11e7f4610cd6468aeea115081dd72ddd7eba0f3f
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Fri Dec 3 15:52:04 2010 -0500

    predefined cpp macros can produce unexpected results (bug 3413)
    
    GNU cpp is predefining a number of symbols, depending on the host and target
    architecture. This can produce some unexpected results: for example, the
    expansion of CLIENTHOST if the host name is i386.my.domain.
    
    The attached patch creates a new -undef option to xrdb that is passed to
    cpp.
    
    Acked-by: Gaetan Nadon <memsize at videotron.ca>
    Signed-off-by: Matthieu Herrb <matthieu.herrb at laas.fr>
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>