xrdb: Changes to 'master'

[Alan Coopersmith]

 xrdb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 60577129058e018f13748b99e51ab1a17088db8e
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Thu Jun 16 15:38:17 2011 -0700

    Tokenize #define names in the PATHETICCPP case too
    
    Fixes generation of the EXT_<extension-name> #defines, since cpp treats
    a #define EXT_MIT-SHM as a token "EXT_MIT" with a value of "-SHM".
    
    Without this fix, an xrdb built with PATHETICCPP prints warnings of:
    macro EXT_XC redefines previous macro at "", line 27
    macro EXT_XVideo redefines previous macro at "", line 33
    macro EXT_MIT redefines previous macro at "", line 35
    macro EXT_MIT redefines previous macro at "", line 37
    
    due to extension #defines such as EXT_MIT-SCREEN-SAVER & EXT_MIT-SHM
    conflicting with each other.
    
    Now matches the non-PATHETICCPP handling of #define names.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>