[xsrc/trunk]: xsrc/external/mit/xinit/dist xinitrc: delay preprocessing of CO...

[uwe <uwe%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/0fc97a967a85
branches:  trunk
changeset: 10840:0fc97a967a85
user:      uwe <uwe%NetBSD.org@localhost>
date:      Wed Dec 29 16:01:58 2021 +0000

description:
xinitrc: delay preprocessing of COLOR in xrdb input

Revert previous and fix it properly.  #ifdef COLOR is intended to be
processed by xrdb, but the script source itself is processed by the C
preprocessor at build time.  Spell that # as XHASH to protect the
conditional.

diffstat:

 external/mit/xinit/dist/xinitrc.cpp |  2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diffs (13 lines):

diff -r ab99455234a0 -r 0fc97a967a85 external/mit/xinit/dist/xinitrc.cpp
--- a/external/mit/xinit/dist/xinitrc.cpp       Tue Dec 28 11:48:52 2021 +0000
+++ b/external/mit/xinit/dist/xinitrc.cpp       Wed Dec 29 16:01:58 2021 +0000
@@ -40,7 +40,9 @@
 #endif
 else
     XRDB -merge - <<EOF
+XHASH ifdef COLOR
 *customization: -color
+XHASH endif
 *VT100.foreground: grey90
 *VT100.background: black
 *VT100.allowBoldFonts:  false