diff options
Diffstat (limited to 'sysdeps/unix/bsd/bits')
| -rw-r--r-- | sysdeps/unix/bsd/bits/fcntl.h | 65 | ||||
| -rw-r--r-- | sysdeps/unix/bsd/bits/stat.h | 2 |
2 files changed, 46 insertions, 21 deletions
diff --git a/sysdeps/unix/bsd/bits/fcntl.h b/sysdeps/unix/bsd/bits/fcntl.h index 3d9bcb5c60..8565170fa5 100644 --- a/sysdeps/unix/bsd/bits/fcntl.h +++ b/sysdeps/unix/bsd/bits/fcntl.h @@ -18,7 +18,7 @@ Boston, MA 02111-1307, USA. */ #ifndef _FCNTL_H -#error "Never use <bits/fcntl.h> directly; include <fcntl.h> instead." +# error "Never use <bits/fcntl.h> directly; include <fcntl.h> instead." #endif @@ -35,10 +35,10 @@ /* Apparently not assigning a controlling terminal is the default behavior in BSD, so no bit is required to request that behavior. */ #define O_NOCTTY 0 /* Don't assign a controlling terminal. */ -#if defined (__USE_BSD) || defined (__USE_SVID) -#define O_ASYNC 0x0040 /* Send SIGIO to owner when data is ready. */ -#define O_FSYNC 0x2000 /* Synchronous writes. */ -#define O_SYNC O_FSYNC +#if defined __USE_BSD || defined __USE_SVID +# define O_ASYNC 0x0040 /* Send SIGIO to owner when data is ready. */ +# define O_FSYNC 0x2000 /* Synchronous writes. */ +# define O_SYNC O_FSYNC #endif /* File status flags for `open' and `fcntl'. */ @@ -48,7 +48,7 @@ #ifdef __USE_BSD /* BSD before 4.4 doesn't support POSIX.1 O_NONBLOCK, but O_NDELAY is close. */ -#define O_NDELAY O_NONBLOCK +# define O_NDELAY O_NONBLOCK #endif #ifdef __USE_BSD @@ -56,26 +56,29 @@ These are all the O_* flags, plus FREAD and FWRITE, which are independent bits set by which of O_RDONLY, O_WRONLY, and O_RDWR, was given to `open'. */ -#define FREAD 1 -#define FWRITE 2 +# define FREAD 1 +# define FWRITE 2 /* Traditional BSD names the O_* bits. */ -#define FASYNC O_ASYNC -#define FCREAT O_CREAT -#define FEXCL O_EXCL -#define FTRUNC O_TRUNC -#define FNOCTTY O_NOCTTY -#define FFSYNC O_FSYNC -#define FSYNC O_SYNC -#define FAPPEND O_APPEND -#define FNONBLOCK O_NONBLOCK -#define FNDELAY O_NDELAY +# define FASYNC O_ASYNC +# define FCREAT O_CREAT +# define FEXCL O_EXCL +# define FTRUNC O_TRUNC +# define FNOCTTY O_NOCTTY +# define FFSYNC O_FSYNC +# define FSYNC O_SYNC +# define FAPPEND O_APPEND +# define FNONBLOCK O_NONBLOCK +# define FNDELAY O_NDELAY #endif /* Mask for file access modes. This is system-dependent in case some system ever wants to define some other flavor of access. */ #define O_ACCMODE (O_RDONLY|O_WRONLY|O_RDWR) +/* XXX missing */ +#define O_LARGEFILE 0 + /* Values for the second argument to `fcntl'. */ #define F_DUPFD 0 /* Duplicate file descriptor. */ #define F_GETFD 1 /* Get file descriptor flags. */ @@ -83,13 +86,18 @@ #define F_GETFL 3 /* Get file status flags. */ #define F_SETFL 4 /* Set file status flags. */ #ifdef __USE_BSD -#define F_GETOWN 5 /* Get owner (receiver of SIGIO). */ -#define F_SETOWN 6 /* Set owner (receiver of SIGIO). */ +# define F_GETOWN 5 /* Get owner (receiver of SIGIO). */ +# define F_SETOWN 6 /* Set owner (receiver of SIGIO). */ #endif #define F_GETLK 7 /* Get record locking info. */ #define F_SETLK 8 /* Set record locking info (non-blocking). */ #define F_SETLKW 9 /* Set record locking info (blocking). */ +/* XXX missing */ +#define F_GETLK64 7 /* Get record locking info. */ +#define F_SETLK64 8 /* Set record locking info (non-blocking). */ +#define F_SETLKW64 9 /* Set record locking info (blocking). */ + /* File descriptor flags used with F_GETFD and F_SETFD. */ #define FD_CLOEXEC 1 /* Close on exec. */ @@ -102,12 +110,29 @@ struct flock { short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */ short int l_whence; /* Where `l_start' is relative to (like `lseek'). */ +#ifndef __USE_FILE_OFFSET64 __off_t l_start; /* Offset where the lock begins. */ __off_t l_len; /* Size of the locked area; zero means until EOF. */ +#else + __off64_t l_start; /* Offset where the lock begins. */ + __off64_t l_len; /* Size of the locked area; zero means until EOF. */ +#endif short int l_pid; /* Process holding the lock. */ short int l_xxx; /* Reserved for future use. */ }; +#ifdef __USE_LARGEFILE64 +struct flock64 + { + short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */ + short int l_whence; /* Where `l_start' is relative to (like `lseek'). */ + __off64_t l_start; /* Offset where the lock begins. */ + __off64_t l_len; /* Size of the locked area; zero means until EOF. */ + short int l_pid; /* Process holding the lock. */ + short int l_xxx; /* Reserved for future use. */ + }; +#endif + /* Values for the `l_type' field of a `struct flock'. */ #define F_RDLCK 1 /* Read lock. */ #define F_WRLCK 2 /* Write lock. */ diff --git a/sysdeps/unix/bsd/bits/stat.h b/sysdeps/unix/bsd/bits/stat.h index 037433f388..71130f3fcb 100644 --- a/sysdeps/unix/bsd/bits/stat.h +++ b/sysdeps/unix/bsd/bits/stat.h @@ -56,7 +56,7 @@ struct stat unsigned long int st_blksize; /* Optimal block size for I/O. */ #define _STATBUF_ST_BLKSIZE /* Tell code we have this member. */ - unsigned long int st_blocks; /* Number of 512-byte blocks allocated. */ + __blkcnt_t st_blocks; /* Number of 512-byte blocks allocated. */ long int st_spare[2]; }; |