about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2012-10-24 08:54:46 +0200
committerAndreas Jaeger <aj@suse.de>2012-10-24 08:54:46 +0200
commit9fddec1a48b8ddf69c7599be9b3a47bf9e5c066c (patch)
tree81161b3458d45d9ae51b28f24253b96d94f13370 /ChangeLog
parent03ac099f6bc9157cdec50db10944e1d99ff07aa1 (diff)
downloadglibc-9fddec1a48b8ddf69c7599be9b3a47bf9e5c066c.tar.gz
glibc-9fddec1a48b8ddf69c7599be9b3a47bf9e5c066c.tar.xz
glibc-9fddec1a48b8ddf69c7599be9b3a47bf9e5c066c.zip
F_GETLK cleanup for <bits/fcntl.h>
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog21
1 files changed, 21 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1484c2f250..a87510fc52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2012-10-24  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/unix/sysv/linux/x86/bits/fcntl.h (F_GETLK, F_SETLK)
+	(F_SETLKW) [__x86_64]: Remove, provided by <bits/fcntl-linux.h>.
+	(F_GETLK, F_SETLK, F_SETLKW) [!__USE_FILE_OFFSET64 && !__x86_64__]:
+	Likewise.
+	(F_GETLK, F_SETLK, F_SETLKW) [__USE_FILE_OFFSET64 && ! __x86_64__]:
+	Likewise.
+	(F_GETLK64, F_SETLK64, F_SETLKW64) [!__x86_64__]: Likewise.
+
+	* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (F_GETLK, F_SETLK)
+	(F_SETLKW) [__USE_FILE_OFFSET64]: Remove, provided by
+	<bits/fcntl-linux.h>.
+	(F_GETLK64, F_SETLK64, F_SETLKW64) [__WORDSIZE == 64]: Likewise.
+
+	* sysdeps/unix/sysv/linux/s390/bits/fcntl.h (F_DUPFD, F_GETFD)
+	(F_SETFD, F_GETFL, F_SETFL): Remove, provided by <bits/fcntl-linux.h>.
+	(F_GETLK, F_SETLK, F_SETLKW) [__WORDSIZE == 64]: Likewise.
+	(F_GETLK, F_SETLK, F_SETLKW, F_GETLK64, F_SETLK64, F_SETLKW64)
+	[__WORDSIZE != 64]: Likewise.
+
 2012-10-23  Joseph Myers  <joseph@codesourcery.com>
 
 	* Makeconfig (run-built-tests): New variable.