diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-05 12:38:17 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-05 12:38:17 +0000 |
commit | 0efa232c593d8fe393b56fb1ff4dda751660b3b3 (patch) | |
tree | b037fe733cd026b5cefb5b27d7f3f6cbc8f4c3ac /usr/src/uts/common/sys/fcntl.h | |
parent | 86b01acdc561eb9c47f9d9e8c33b2d15e064aed7 (diff) | |
parent | 7484d76e78bc19298de9589214be103d65cf3989 (diff) | |
download | illumos-joyent-0efa232c593d8fe393b56fb1ff4dda751660b3b3.tar.gz |
[illumos-gate merge]
commit 7484d76e78bc19298de9589214be103d65cf3989
12263 libc: NULL pointer errors (sparc)
commit b36afad7ffe84071c2c6831936cc1c524bd1ca90
12216 Clean up libc-tests smatch
commit 69c811ab73b7ce531454837ae68c4343e8724e0b
9965 Want support for O_DIRECTORY
commit 2fe8bc68ec8e8e8e05997b3ac2f081bfdded45ab
12275 check_rtime(1onbld): BUNDEF_OBJ and BUNUSED_OBJ
commit 5fe3b0929d8a195dbfa4196d72a3f9b15b745171
12084 idm_conn_event_handler mishandles CA_DROP action
Conflicts:
usr/src/test/os-tests/tests/Makefile
Diffstat (limited to 'usr/src/uts/common/sys/fcntl.h')
-rw-r--r-- | usr/src/uts/common/sys/fcntl.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr/src/uts/common/sys/fcntl.h b/usr/src/uts/common/sys/fcntl.h index 3167fd4a1d..cf55ebbf2a 100644 --- a/usr/src/uts/common/sys/fcntl.h +++ b/usr/src/uts/common/sys/fcntl.h @@ -86,6 +86,9 @@ extern "C" { #define O_NOFOLLOW 0x20000 /* don't follow symlinks */ #define O_NOLINKS 0x40000 /* don't allow multiple hard links */ #define O_CLOEXEC 0x800000 /* set the close-on-exec flag */ +#if !defined(_STRICT_SYMBOLS) || defined(_XPG7) +#define O_DIRECTORY 0x1000000 /* fail if not a directory */ +#endif /* * fcntl(2) requests @@ -181,7 +184,7 @@ extern "C" { #endif /* _STRICT_SYMBOLS */ #endif /* _LP64 || _FILE_OFFSET_BITS == 32 */ -#if defined(_LARGEFILE64_SOURCE) +#if defined(_LARGEFILE64_SOURCE) #if !defined(_LP64) || defined(_KERNEL) /* @@ -260,7 +263,7 @@ typedef struct flock32 { /* transitional large file interface version */ -#if defined(_LARGEFILE64_SOURCE) +#if defined(_LARGEFILE64_SOURCE) typedef struct flock64 { short l_type; |