From 2747c0eab5e85418498def16aa91f36bd9855808 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 8 Sep 2000 08:12:57 +0000 Subject: [PATCH] * sysdeps/unix/sysv/linux/arm/lockf64.c: New file. * sysdeps/unix/sysv/linux/arm/fcntl.c: New file. * sysdeps/unix/sysv/linux/arm/bits/fcntl.h (F_GETLK64,F_SETLK64,F_SETLKW64): Use values from 2.4.0-test8. (F_GETLK,F_SETLK,F_SETLKW): Handle __USE_FILE_OFFSET64 correctly. --- sysdeps/unix/sysv/linux/arm/bits/fcntl.h | 21 +++++++++++++-------- sysdeps/unix/sysv/linux/arm/fcntl.c | 1 + sysdeps/unix/sysv/linux/arm/lockf64.c | 1 + 3 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/arm/fcntl.c create mode 100644 sysdeps/unix/sysv/linux/arm/lockf64.c diff --git a/sysdeps/unix/sysv/linux/arm/bits/fcntl.h b/sysdeps/unix/sysv/linux/arm/bits/fcntl.h index de1dd4a..deaa183 100644 --- a/sysdeps/unix/sysv/linux/arm/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/arm/bits/fcntl.h @@ -65,14 +65,19 @@ #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). */ - -/* XXX missing */ -#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). */ + +#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). */ #if defined __USE_BSD || defined __USE_XOPEN2K # define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ diff --git a/sysdeps/unix/sysv/linux/arm/fcntl.c b/sysdeps/unix/sysv/linux/arm/fcntl.c new file mode 100644 index 0000000..ea951bc --- /dev/null +++ b/sysdeps/unix/sysv/linux/arm/fcntl.c @@ -0,0 +1 @@ +#include diff --git a/sysdeps/unix/sysv/linux/arm/lockf64.c b/sysdeps/unix/sysv/linux/arm/lockf64.c new file mode 100644 index 0000000..a88f5a7 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arm/lockf64.c @@ -0,0 +1 @@ +#include -- 2.7.4