diff options
author | harti <harti@FreeBSD.org> | 2005-03-11 13:02:38 +0000 |
---|---|---|
committer | harti <harti@FreeBSD.org> | 2005-03-11 13:02:38 +0000 |
commit | d72309cdade808e436dae5798f95e35937bafb6b (patch) | |
tree | aada4c3001fac6002b56a38e8d677fd091fb81a9 /usr.bin/make/main.c | |
parent | dc263e28e9ab4cc34ef8539e579b33c18bddf69a (diff) | |
download | FreeBSD-src-d72309cdade808e436dae5798f95e35937bafb6b.zip FreeBSD-src-d72309cdade808e436dae5798f95e35937bafb6b.tar.gz |
Remove leading underscores from the pathname defines. All identifiers
with leading underscore followed by an uppercase letter are in the
implementation namespace.
Diffstat (limited to 'usr.bin/make/main.c')
-rw-r--r-- | usr.bin/make/main.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index 58f6361..85deca7 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -487,7 +487,7 @@ main(int argc, char **argv) char *cp = NULL, *start; /* avoid faults on read-only strings */ - static char syspath[] = _PATH_DEFSYSPATH; + static char syspath[] = PATH_DEFSYSPATH; { /* @@ -666,9 +666,9 @@ main(int argc, char **argv) * * 1. MAKEOBJDIRPREFIX`cwd` * 2. MAKEOBJDIR - * 3. _PATH_OBJDIR.${MACHINE} - * 4. _PATH_OBJDIR - * 5. _PATH_OBJDIRPREFIX`cwd` + * 3. PATH_OBJDIR.${MACHINE} + * 4. PATH_OBJDIR + * 5. PATH_OBJDIRPREFIX`cwd` * * If one of the first two fails, use the current directory. * If the remaining three all fail, use the current directory. @@ -680,8 +680,8 @@ main(int argc, char **argv) */ if (!(pathp = getenv("MAKEOBJDIRPREFIX"))) { if (!(path = getenv("MAKEOBJDIR"))) { - path = _PATH_OBJDIR; - pathp = _PATH_OBJDIRPREFIX; + path = PATH_OBJDIR; + pathp = PATH_OBJDIRPREFIX; snprintf(mdpath, MAXPATHLEN, "%s.%s", path, machine); if (!(objdir = chdir_verify_path(mdpath, obpath))) @@ -772,9 +772,9 @@ main(int argc, char **argv) Lst sysMkPath = Lst_Initializer(sysMkPath); LstNode *ln; - Dir_Expand(_PATH_DEFSYSMK, &sysIncPath, &sysMkPath); + Dir_Expand(PATH_DEFSYSMK, &sysIncPath, &sysMkPath); if (Lst_IsEmpty(&sysMkPath)) - Fatal("make: no system rules (%s).", _PATH_DEFSYSMK); + Fatal("make: no system rules (%s).", PATH_DEFSYSMK); ln = Lst_Find(&sysMkPath, NULL, ReadMakefile); if (ln != NULL) Fatal("make: cannot open %s.", (char *)Lst_Datum(ln)); |