diff options
| author |   Andreas Jaeger <aj@suse.de> | 2012-10-24 08:54:46 +0200 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2012-10-24 08:54:46 +0200 |
| commit | 9fddec1a48b8ddf69c7599be9b3a47bf9e5c066c (patch) | |
| tree | 81161b3458d45d9ae51b28f24253b96d94f13370 /sysdeps/unix/sysv | |
| parent | Define and use $(run-built-tests). (diff) | |
| download | glibc-9fddec1a48b8ddf69c7599be9b3a47bf9e5c066c.tar.gz glibc-9fddec1a48b8ddf69c7599be9b3a47bf9e5c066c.tar.bz2 glibc-9fddec1a48b8ddf69c7599be9b3a47bf9e5c066c.zip | |
F_GETLK cleanup for <bits/fcntl.h>
Diffstat (limited to 'sysdeps/unix/sysv')
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/bits/fcntl.h | 22 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/fcntl.h | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86/bits/fcntl.h | 16 |
3 files changed, 0 insertions, 46 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h index ecf1baf8b9..43eee7a37a 100644 --- a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h @@ -29,33 +29,11 @@ # define __O_LARGEFILE 0100000 #endif -/* Values for the second argument to `fcntl'. */ -#define F_DUPFD 0 /* Duplicate file descriptor. */ -#define F_GETFD 1 /* Get file descriptor flags. */ -#define F_SETFD 2 /* Set file descriptor flags. */ -#define F_GETFL 3 /* Get file status flags. */ -#define F_SETFL 4 /* Set file status flags. */ #if __WORDSIZE == 64 -# 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 -# 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 struct flock diff --git a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h index 0f4bf76490..22e71fcd7e 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h @@ -56,20 +56,12 @@ # 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). */ -#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 #if __WORDSIZE == 64 # 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). */ -#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). */ #endif /* For posix fcntl() and `l_type' field of a `struct flock' for lockf(). */ diff --git a/sysdeps/unix/sysv/linux/x86/bits/fcntl.h b/sysdeps/unix/sysv/linux/x86/bits/fcntl.h index dcf4fc01af..9251e750ed 100644 --- a/sysdeps/unix/sysv/linux/x86/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/x86/bits/fcntl.h @@ -27,26 +27,10 @@ #endif #ifdef __x86_64__ -# 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 -# 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 |