This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch aj/shared-linux-fcntl updated. glibc-2.16-ports-merge-520-g38dbec9
- From: aj at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 24 Oct 2012 08:10:59 -0000
- Subject: GNU C Library master sources branch aj/shared-linux-fcntl updated. glibc-2.16-ports-merge-520-g38dbec9
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, aj/shared-linux-fcntl has been updated
via 38dbec99f998ad42431ecb2112486a3389c4b00c (commit)
from aec22f45f4b7ec2d5d6bf2abcd696788bd17eba2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=38dbec99f998ad42431ecb2112486a3389c4b00c
commit 38dbec99f998ad42431ecb2112486a3389c4b00c
Author: Andreas Jaeger <aj@suse.de>
Date: Wed Oct 24 10:07:48 2012 +0200
PowerPC: Use <bits/fcntl-linux.h>
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
index 86639f5..e0ecb83 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
@@ -26,26 +26,13 @@
#define __O_NOFOLLOW 0100000 /* Do not follow links. */
#define __O_DIRECT 0400000 /* Direct disk access. */
-# if __WORDSIZE == 64
-/* Not necessary, files are always with 64bit off_t. */
-# define __O_LARGEFILE 0
-# else
-# define __O_LARGEFILE 0200000
-# endif
-#endif
-
#if __WORDSIZE == 64
-// XXX: The following three values look wrong
-# 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). */
+/* Not necessary, files are always with 64bit off_t. */
+# define __O_LARGEFILE 0
#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 __O_LARGEFILE 0200000
#endif
-
struct flock
{
short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
-----------------------------------------------------------------------
Summary of changes:
sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h | 19 +++----------------
1 files changed, 3 insertions(+), 16 deletions(-)
hooks/post-receive
--
GNU C Library master sources