summaryrefslogtreecommitdiff
path: root/libc/sysdeps/unix/sysv/linux/bits
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2009-03-15 15:53:55 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2009-03-15 15:53:55 +0000
commit780a701d63b25431f31d77f0701f98bfe5ea2d94 (patch)
treebe2c2f5c557acee55c8ab41b6d3a87d8f84b3cbd /libc/sysdeps/unix/sysv/linux/bits
parenta6728b114d9c99b8515accb002474ea703a6705c (diff)
downloadeglibc2-780a701d63b25431f31d77f0701f98bfe5ea2d94.tar.gz
Merge changes between r7922 and r8107 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@8108 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/unix/sysv/linux/bits')
-rw-r--r--libc/sysdeps/unix/sysv/linux/bits/posix_opt.h24
-rw-r--r--libc/sysdeps/unix/sysv/linux/bits/stat.h5
2 files changed, 14 insertions, 15 deletions
diff --git a/libc/sysdeps/unix/sysv/linux/bits/posix_opt.h b/libc/sysdeps/unix/sysv/linux/bits/posix_opt.h
index 37612e0bd..69198a665 100644
--- a/libc/sysdeps/unix/sysv/linux/bits/posix_opt.h
+++ b/libc/sysdeps/unix/sysv/linux/bits/posix_opt.h
@@ -1,5 +1,5 @@
/* Define POSIX options for Linux.
- Copyright (C) 1996,1997,1999,2000,2002,2003,2008
+ Copyright (C) 1996,1997,1999,2000,2002,2003,2008,2009
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -32,25 +32,25 @@
#define _POSIX_SAVED_IDS 1
/* Priority scheduling is supported. */
-#define _POSIX_PRIORITY_SCHEDULING 200112L
+#define _POSIX_PRIORITY_SCHEDULING 200809L
/* Synchronizing file data is supported. */
-#define _POSIX_SYNCHRONIZED_IO 200112L
+#define _POSIX_SYNCHRONIZED_IO 200809L
/* The fsync function is present. */
-#define _POSIX_FSYNC 200112L
+#define _POSIX_FSYNC 200809L
/* Mapping of files to memory is supported. */
-#define _POSIX_MAPPED_FILES 200112L
+#define _POSIX_MAPPED_FILES 200809L
/* Locking of all memory is supported. */
-#define _POSIX_MEMLOCK 200112L
+#define _POSIX_MEMLOCK 200809L
/* Locking of ranges of memory is supported. */
-#define _POSIX_MEMLOCK_RANGE 200112L
+#define _POSIX_MEMLOCK_RANGE 200809L
/* Setting of memory protections is supported. */
-#define _POSIX_MEMORY_PROTECTION 200112L
+#define _POSIX_MEMORY_PROTECTION 200809L
/* Some filesystems allow all users to change file ownership. */
#define _POSIX_CHOWN_RESTRICTED 0
@@ -69,7 +69,7 @@
#define _XOPEN_SHM 1
/* Real-time signals are supported. */
-#define _POSIX_REALTIME_SIGNALS 200112L
+#define _POSIX_REALTIME_SIGNALS 200809L
/* The LFS interface is available, except for the asynchronous I/O. */
#define _LFS_LARGEFILE 1
@@ -77,10 +77,10 @@
#define _LFS64_STDIO 1
/* POSIX timers are available. */
-#define _POSIX_TIMERS 200112L
+#define _POSIX_TIMERS 200809L
/* POSIX shared memory objects are implemented. */
-#define _POSIX_SHARED_MEMORY_OBJECTS 200112L
+#define _POSIX_SHARED_MEMORY_OBJECTS 200809L
/* GNU libc provides regular expression handling. */
#define _POSIX_REGEXP 1
@@ -89,7 +89,7 @@
#define _POSIX_SHELL 1
/* The `spawn' function family is supported. */
-#define _POSIX_SPAWN 200112L
+#define _POSIX_SPAWN 200809L
/* The monotonic clock might be available. */
#define _POSIX_MONOTONIC_CLOCK 0
diff --git a/libc/sysdeps/unix/sysv/linux/bits/stat.h b/libc/sysdeps/unix/sysv/linux/bits/stat.h
index cc665f377..e6a5b6afb 100644
--- a/libc/sysdeps/unix/sysv/linux/bits/stat.h
+++ b/libc/sysdeps/unix/sysv/linux/bits/stat.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2001, 2002, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -162,8 +162,7 @@ struct stat64
#define __S_IWRITE 0200 /* Write by owner. */
#define __S_IEXEC 0100 /* Execute by owner. */
-#if defined __USE_ATFILE || defined __USE_GNU
-/* XXX This will change to the macro for the next 2008 POSIX revision. */
+#ifdef __USE_ATFILE
# define UTIME_NOW ((1l << 30) - 1l)
# define UTIME_OMIT ((1l << 30) - 2l)
#endif