diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-08-12 22:17:43 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-08-12 22:17:43 +0000 |
| commit | 2390667ff2c6dd0793c3fdf84c61f625a783a443 (patch) | |
| tree | cd5cf6299871dbc8b065c4431bfa30b125c91dba | |
| parent | 00c02822b89f12806ee764fb3031a880bc7ecc78 (diff) | |
| download | glibc-2390667ff2c6dd0793c3fdf84c61f625a783a443.tar.gz glibc-2390667ff2c6dd0793c3fdf84c61f625a783a443.tar.xz glibc-2390667ff2c6dd0793c3fdf84c61f625a783a443.zip | |
Update.
2000-08-12 Andreas Jaeger <aj@suse.de> * sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Handle __USE_FILE_OFFSET64 correctly for locking. * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/bits/fcntl.h | 12 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/fcntl.h | 24 |
3 files changed, 30 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index ef61a2b7c6..2faa12c1fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-08-12 Andreas Jaeger <aj@suse.de> + + * sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Handle + __USE_FILE_OFFSET64 correctly for locking. + * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise. + 2000-08-12 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_FCNTL64): diff --git a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h index fd86c555a7..ba15580277 100644 --- a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h @@ -65,9 +65,15 @@ #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). */ +#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). */ diff --git a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h index 4cf16f222c..bcc96244c6 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h @@ -79,9 +79,15 @@ # define F_GETOWN 5 /* Get owner of socket (receiver of SIGIO). */ # define F_SETOWN 6 /* Set owner of socket (receiver of SIGIO). */ #endif -#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). */ +#ifndef __USE_FILE_OFFSET64 +# 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 #ifdef __USE_GNU # define F_SETSIG 10 /* Set number of signal to be sent. */ @@ -89,13 +95,13 @@ #endif #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_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). */ +# 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 F_[GET|SET]FL */ |