itrc: avoid problematic internal names "var", "thread" - plan9port - [fork] Plan 9 from user space Err mx1.adamsgaard.dk 70 hgit clone git://src.adamsgaard.dk/plan9port URL:git://src.adamsgaard.dk/plan9port mx1.adamsgaard.dk 70 1Log /src/plan9port/log.gph mx1.adamsgaard.dk 70 1Files /src/plan9port/files.gph mx1.adamsgaard.dk 70 1Refs /src/plan9port/refs.gph mx1.adamsgaard.dk 70 1README /src/plan9port/file/README.md.gph mx1.adamsgaard.dk 70 1LICENSE /src/plan9port/file/LICENSE.gph mx1.adamsgaard.dk 70 i--- Err mx1.adamsgaard.dk 70 1commit 20c841bac102e777a3a1723724fa5d31018fefcc /src/plan9port/commit/20c841bac102e777a3a1723724fa5d31018fefcc.gph mx1.adamsgaard.dk 70 1parent dea4dbdba6e8a4652e682627dce50503bca5c4b4 /src/plan9port/commit/dea4dbdba6e8a4652e682627dce50503bca5c4b4.gph mx1.adamsgaard.dk 70 hAuthor: Russ Cox URL:mailto:rsc@swtch.com mx1.adamsgaard.dk 70 iDate: Mon, 18 May 2020 22:32:59 -0400 Err mx1.adamsgaard.dk 70 i Err mx1.adamsgaard.dk 70 irc: avoid problematic internal names "var", "thread" Err mx1.adamsgaard.dk 70 i Err mx1.adamsgaard.dk 70 iFor AIX. Err mx1.adamsgaard.dk 70 i Err mx1.adamsgaard.dk 70 iDiffstat: Err mx1.adamsgaard.dk 70 i M src/cmd/rc/rc.h | 6 ++++++ Err mx1.adamsgaard.dk 70 i Err mx1.adamsgaard.dk 70 i1 file changed, 6 insertions(+), 0 deletions(-) Err mx1.adamsgaard.dk 70 i--- Err mx1.adamsgaard.dk 70 1diff --git a/src/cmd/rc/rc.h b/src/cmd/rc/rc.h /src/plan9port/file/src/cmd/rc/rc.h.gph mx1.adamsgaard.dk 70 it@@ -33,6 +33,12 @@ Err mx1.adamsgaard.dk 70 i #undef pipe /* so that /dev/fd works */ Err mx1.adamsgaard.dk 70 i #define searchpath rcsearchpath /* avoid new libc function */ Err mx1.adamsgaard.dk 70 i Err mx1.adamsgaard.dk 70 i+/* some systems define a global "var", "thread" */ Err mx1.adamsgaard.dk 70 i+#undef var Err mx1.adamsgaard.dk 70 i+#define var rcvar Err mx1.adamsgaard.dk 70 i+#undef thread Err mx1.adamsgaard.dk 70 i+#define thread rcthread Err mx1.adamsgaard.dk 70 i+ Err mx1.adamsgaard.dk 70 i typedef struct tree tree; Err mx1.adamsgaard.dk 70 i typedef struct word word; Err mx1.adamsgaard.dk 70 i typedef struct io io; Err mx1.adamsgaard.dk 70 .