From 7cd37b437c7505cc6e7ac28f3ca0cbd52c8927ea Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 22 Oct 2012 09:29:52 +0200 Subject: [PATCH] Improve : F_GETLK etc. (F_GETLK, F_SETLK, F_SETLKW) [!F_GETLK]: Define values for [!__USE_FILE_OFFSET64]. --- ChangeLog | 3 +++ sysdeps/unix/sysv/linux/bits/fcntl-linux.h | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35aa29c..50884bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-10-22 Andreas Jaeger + * 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 8527371..f0c0d7d 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. */ -- 2.7.4