diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2011-07-10 13:20:26 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2011-07-10 13:20:26 +0000 |
| commit | 5f63d5b74dc6bf5f4a6d5419820ca87993d65744 (patch) | |
| tree | 202d0c20e877edfd10ceae5dd35fcbad610c2290 /usr.bin/vi/include/options_def.h | |
| parent | 1b048a82de1a11bdcc6c4fece61e470fbe9230c0 (diff) | |
Rename O_DIRECTORY to O_TMP_DIRECTORY to avoid a namespace collision
with sys/fcntl.h. OK deraadt@
Diffstat (limited to 'usr.bin/vi/include/options_def.h')
| -rw-r--r-- | usr.bin/vi/include/options_def.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/vi/include/options_def.h b/usr.bin/vi/include/options_def.h index 890a516e127..7d6c022a0fd 100644 --- a/usr.bin/vi/include/options_def.h +++ b/usr.bin/vi/include/options_def.h @@ -1,4 +1,4 @@ -/* $OpenBSD: options_def.h,v 1.4 2001/01/29 01:58:47 niklas Exp $ */ +/* $OpenBSD: options_def.h,v 1.5 2011/07/10 13:20:25 millert Exp $ */ #define O_ALTWERASE 0 #define O_AUTOINDENT 1 @@ -10,7 +10,7 @@ #define O_CEDIT 7 #define O_COLUMNS 8 #define O_COMMENT 9 -#define O_DIRECTORY 10 +#define O_TMP_DIRECTORY 10 #define O_EDCOMPATIBLE 11 #define O_ESCAPETIME 12 #define O_ERRORBELLS 13 |