diff options
| author | cgd <cgd@NetBSD.org> | 2000-12-19 23:09:02 +0000 |
|---|---|---|
| committer | cgd <cgd@NetBSD.org> | 2000-12-19 23:09:02 +0000 |
| commit | 3e7f7ef82d68902a11cdfe91eaedef1889e1b365 (patch) | |
| tree | eeb48d50b3ce3cd8755e95006e2ecec2748c1af1 /lib/libutil | |
| parent | 47a48d2057445d1cb556eac0062b034e8e207a50 (diff) | |
__CONCAT does token pasting, not string concatnation. if something like:
__CONCAT("PATH=",_PATH_STDPATH);
actually works to concantate strings, it's because the preprocessor expands
it into "PATH=""whatever _PATH_STDPATH is" as separate strings, and then
ANSI string concatenation is performed on that. It's more straightforward
to just use ANSI string concatenation directly, and newer GCCs complain
(rightly) about mis-use of token pasting.
Diffstat (limited to 'lib/libutil')
| -rw-r--r-- | lib/libutil/ttyaction.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libutil/ttyaction.c b/lib/libutil/ttyaction.c index d7de63b18b1..1350844dbd1 100644 --- a/lib/libutil/ttyaction.c +++ b/lib/libutil/ttyaction.c @@ -1,4 +1,4 @@ -/* $NetBSD: ttyaction.c,v 1.14 2000/07/05 11:46:42 ad Exp $ */ +/* $NetBSD: ttyaction.c,v 1.15 2000/12/19 23:09:02 cgd Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: ttyaction.c,v 1.14 2000/07/05 11:46:42 ad Exp $"); +__RCSID("$NetBSD: ttyaction.c,v 1.15 2000/12/19 23:09:02 cgd Exp $"); #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -67,7 +67,7 @@ __RCSID("$NetBSD: ttyaction.c,v 1.14 2000/07/05 11:46:42 ad Exp $"); #endif static char *actfile = _PATH_TTYACTION; -static char *pathenv = __CONCAT("PATH=",_PATH_STDPATH); +static char *pathenv = "PATH=" _PATH_STDPATH; int ttyaction(const char *tty, const char *act, const char *user) |
