Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

__CONCAT does token pasting, not string concatnation. if something like:

Browse Source 
__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.
This commit is contained in:
cgd 2000-12-20 00:15:10 +00:00
parent a0319e43fd
commit 84d782a52f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/sh/var.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: var.c,v 1.25 2000/05/22 10:18:47 elric Exp $ */
/* $NetBSD: var.c,v 1.26 2000/12/20 00:15:10 cgd Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 5/4/95";
#else
__RCSID("$NetBSD: var.c,v 1.25 2000/05/22 10:18:47 elric Exp $");
__RCSID("$NetBSD: var.c,v 1.26 2000/12/20 00:15:10 cgd Exp $");
#endif
#endif /* not lint */
@ -114,7 +114,7 @@ const struct varinit varinit[] = {
NULL },
{ &vmpath, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH=",
NULL },
{ &vpath, VSTRFIXED|VTEXTFIXED, __CONCAT("PATH=",_PATH_DEFPATH),
{ &vpath, VSTRFIXED|VTEXTFIXED, "PATH=" _PATH_DEFPATH,
changepath },
/*
* vps1 depends on uid