diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-06-16 15:38:17 -0700 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-06-16 15:38:17 -0700 |
commit | 60577129058e018f13748b99e51ab1a17088db8e (patch) | |
tree | 2bf129ba7cffb632f9ec8380a732dc517b4e19b7 | |
parent | 4b8990ea599aee08284481b258cccdc25dd5d8d8 (diff) |
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@oracle.com>
-rw-r--r-- | xrdb.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -420,7 +420,7 @@ AddDef(String *buff, char *title, char *value) #ifdef PATHETICCPP if (need_real_defines) { addstring(buff, "\n#define "); - addstring(buff, title); + addtokstring(buff, title); if (value && (value[0] != '\0')) { addstring(buff, " "); addstring(buff, value); |