diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-06-27 20:48:27 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-06-27 20:48:27 +0000 |
| commit | f2481c319d604a9d797df6147ec6d3010861e4a4 (patch) | |
| tree | 715ab4444fcabb043e8e9b5ca525c2e68dae964a /sysdeps/unix/sysv/linux/x86_64 | |
| parent | 46f4c5787ad7e3940d3cfb67320e70cff2fbe032 (diff) | |
Update.
2004-06-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/powerpc/fcntl.c: Move to...
* sysdeps/unix/sysv/linux/powerpc/powerpc32/fcntl.c: ... here.
* sysdeps/unix/sysv/linux/powerpc/lockf64.c: Move to...
* sysdeps/unix/sysv/linux/powerpc/powerpc32/lockf64.c: ... here.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c: New file.
* sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h (F_GETLK, F_SETLK,
F_SETLKW): Fix values for -m32 -D_FILE_OFFSET_BITS=64.
Diffstat (limited to 'sysdeps/unix/sysv/linux/x86_64')
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h index 5e11760bf0..2247af08a5 100644 --- a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h @@ -70,18 +70,29 @@ #define F_SETFD 2 /* Set file descriptor flags. */ #define F_GETFL 3 /* Get file status flags. */ #define F_SETFL 4 /* Set file status flags. */ -#define F_GETLK 5 /* Get record locking info. */ -#define F_SETLK 6 /* Set record locking info (non-blocking). */ -#define F_SETLKW 7 /* Set record locking info (blocking). */ #if __WORDSIZE == 64 -# define F_GETLK64 F_GETLK /* Get record locking info. */ -# define F_SETLK64 F_SETLK /* Set record locking info (non-blocking). */ -# define F_SETLKW64 F_SETLKW /* Set record locking info (blocking). */ +# define F_GETLK 5 /* Get record locking info. */ +# define F_SETLK 6 /* Set record locking info (non-blocking). */ +# define F_SETLKW 7 /* Set record locking info (blocking). */ +/* Not necessary, we always have 64-bit offsets. */ +# define F_GETLK64 5 /* Get record locking info. */ +# define F_SETLK64 6 /* Set record locking info (non-blocking). */ +# define F_SETLKW64 7 /* Set record locking info (blocking). */ #else -#define F_GETLK64 12 /* Get record locking info. */ -#define F_SETLK64 13 /* Set record locking info (non-blocking). */ -#define F_SETLKW64 14 /* Set record locking info (blocking). */ +# ifndef __USE_FILE_OFFSET64 +# define F_GETLK 5 /* Get record locking info. */ +# define F_SETLK 6 /* Set record locking info (non-blocking). */ +# define F_SETLKW 7 /* Set record locking info (blocking). */ +# else +# define F_GETLK F_GETLK64 /* Get record locking info. */ +# define F_SETLK F_SETLK64 /* Set record locking info (non-blocking).*/ +# define F_SETLKW F_SETLKW64 /* Set record locking info (blocking). */ +# endif +# define F_GETLK64 12 /* Get record locking info. */ +# define F_SETLK64 13 /* Set record locking info (non-blocking). */ +# define F_SETLKW64 14 /* Set record locking info (blocking). */ #endif + #if defined __USE_BSD || defined __USE_UNIX98 # define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ # define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ |