diff options
author | jh <jh@FreeBSD.org> | 2013-05-15 18:41:49 +0000 |
---|---|---|
committer | jh <jh@FreeBSD.org> | 2013-05-15 18:41:49 +0000 |
commit | c5c3f4f392975f0ffee18a566ed088e8426f41c5 (patch) | |
tree | ac4ce651ae0a8a2220c59abc7532a20ada2f8c9e /contrib/nvi/common/options.c | |
parent | 9a44ba5a35ddfdecc900866bb22238baa2953a3f (diff) | |
download | FreeBSD-src-c5c3f4f392975f0ffee18a566ed088e8426f41c5.zip FreeBSD-src-c5c3f4f392975f0ffee18a566ed088e8426f41c5.tar.gz |
Rename O_DIRECTORY to O_TMP_DIRECTORY to avoid shadowing the fcntl.h
O_DIRECTORY flag.
PR: bin/173924
Obtained from: git://repo.or.cz/nvi.git
Diffstat (limited to 'contrib/nvi/common/options.c')
-rw-r--r-- | contrib/nvi/common/options.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/nvi/common/options.c b/contrib/nvi/common/options.c index fe310fc..dea4eba 100644 --- a/contrib/nvi/common/options.c +++ b/contrib/nvi/common/options.c @@ -64,7 +64,7 @@ OPTLIST const optlist[] = { {"columns", f_columns, OPT_NUM, OPT_NOSAVE}, /* O_COMMENT 4.4BSD */ {"comment", NULL, OPT_0BOOL, 0}, -/* O_DIRECTORY 4BSD */ +/* O_TMP_DIRECTORY 4BSD */ {"directory", NULL, OPT_STR, 0}, /* O_EDCOMPATIBLE 4BSD */ {"edcompatible",NULL, OPT_0BOOL, 0}, @@ -244,7 +244,7 @@ static OABBREV const abbrev[] = { {"aw", O_AUTOWRITE}, /* 4BSD */ {"bf", O_BEAUTIFY}, /* 4BSD */ {"co", O_COLUMNS}, /* 4.4BSD */ - {"dir", O_DIRECTORY}, /* 4BSD */ + {"dir", O_TMP_DIRECTORY}, /* 4BSD */ {"eb", O_ERRORBELLS}, /* 4BSD */ {"ed", O_EDCOMPATIBLE}, /* 4BSD */ {"ex", O_EXRC}, /* System V (undocumented) */ @@ -347,7 +347,7 @@ opts_init(sp, oargs) */ (void)snprintf(b1, sizeof(b1), "directory=%s", (s = getenv("TMPDIR")) == NULL ? _PATH_TMP : s); - OI(O_DIRECTORY, b1); + OI(O_TMP_DIRECTORY, b1); OI(O_ESCAPETIME, "escapetime=6"); OI(O_KEYTIME, "keytime=6"); OI(O_MATCHTIME, "matchtime=7"); |