diff options
| author | Andreas Jaeger <aj@suse.de> | 2012-10-22 09:29:52 +0200 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2012-10-22 09:31:13 +0200 |
| commit | 7cd37b437c7505cc6e7ac28f3ca0cbd52c8927ea (patch) | |
| tree | a45aa06e9bf41aed9b2ffef8d831ec95d7fddca5 | |
| parent | 1728f92d421477b6ec02a0318bb074660d8c6c77 (diff) | |
| download | glibc-7cd37b437c7505cc6e7ac28f3ca0cbd52c8927ea.tar.gz glibc-7cd37b437c7505cc6e7ac28f3ca0cbd52c8927ea.tar.xz glibc-7cd37b437c7505cc6e7ac28f3ca0cbd52c8927ea.zip | |
Improve <bits/fcntl-linux.h>: F_GETLK etc.
(F_GETLK, F_SETLK, F_SETLKW) [!F_GETLK]: Define values for [!__USE_FILE_OFFSET64].
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/fcntl-linux.h | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 35aa29c6ee..50884bc031 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-10-22 Andreas Jaeger <aj@suse.de> + * sysdeps/unix/sysv/linux/bits/fcntl-linux.h (F_GETLK, F_SETLK) + (F_SETLKW) [!F_GETLK]: Define values for [!__USE_FILE_OFFSET64]. + * sysdeps/unix/sysv/linux/s390/bits/fcntl.h (O_LARGEFILE): Rename to __O_LARGEFILE. * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (O_LARGEFILE): Rename diff --git a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h index 85273719a2..f0c0d7d1c7 100644 --- a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h +++ b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h @@ -98,9 +98,15 @@ #endif #ifndef F_GETLK -# 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). */ +# 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 #endif #ifndef F_GETLK64 # define F_GETLK64 12 /* Get record locking info. */ |